From: Peter Korsgaard Date: Thu, 21 Mar 2013 04:00:03 +0000 (+0000) Subject: mmc: mmc_getcd/getwp: use sensible defaults X-Git-Tag: v2013.04-rc2~14^2~6^2~1 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4e1da4e093d156d30bd08c90ec2e733d50904a2;p=oweals%2Fu-boot.git mmc: mmc_getcd/getwp: use sensible defaults Let mmc_getcd() return true and mmc_getwp() false if mmc driver doesn't provide handlers for them. Signed-off-by: Peter Korsgaard [trini: Add braces around first if test in each case to fix warning] Signed-off-by: Tom Rini --- diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 7b5fdd9f66..d732581eb8 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -51,8 +51,12 @@ int mmc_getwp(struct mmc *mmc) wp = board_mmc_getwp(mmc); - if ((wp < 0) && mmc->getwp) - wp = mmc->getwp(mmc); + if (wp < 0) { + if (mmc->getwp) + wp = mmc->getwp(mmc); + else + wp = 0; + } return wp; } @@ -692,8 +696,12 @@ int mmc_getcd(struct mmc *mmc) cd = board_mmc_getcd(mmc); - if ((cd < 0) && mmc->getcd) - cd = mmc->getcd(mmc); + if (cd < 0) { + if (mmc->getcd) + cd = mmc->getcd(mmc); + else + cd = 1; + } return cd; }