sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Peter Korsgaard 2013-03-21 04:00:03 +00:00 committed by Tom Rini
parent bd380cf4cf
commit d4e1da4e09
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mmc/mmc.c
View File

@ -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;
}