diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-24 17:52:22 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-24 17:52:22 +0100 |
| commit | b6379e15a70cc2e22486e5962927d9de374d877b (patch) | |
| tree | ce5c97f3754c29fa5d69a2da9b651ed59e876189 /drivers/mmc/mmc.c | |
| parent | 536121328eae940458f065608345b5fed8286859 (diff) | |
| parent | 173ddc5b68fa41e55293d1095cafdc21fd11cf65 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 7b5fdd9f66e..d732581eb8d 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; } |