summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPeter Korsgaard <peter.korsgaard@barco.com>2013-03-21 04:00:03 +0000
committerTom Rini <trini@ti.com>2013-03-24 12:49:12 -0400
commitd4e1da4e093d156d30bd08c90ec2e733d50904a2 (patch)
tree370228f415d29539924f051d3c5732d931ae0c24 /drivers
parentbd380cf4cf9ae5b970f09784a90132bee80ee5d0 (diff)
downloadu-boot-imx-d4e1da4e093d156d30bd08c90ec2e733d50904a2.zip
u-boot-imx-d4e1da4e093d156d30bd08c90ec2e733d50904a2.tar.gz
u-boot-imx-d4e1da4e093d156d30bd08c90ec2e733d50904a2.tar.bz2
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 <peter.korsgaard@barco.com> [trini: Add braces around first if test in each case to fix warning] Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/mmc.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 7b5fdd9..d732581 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;
}