summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDiego Santa Cruz <Diego.SantaCruz@spinetix.com>2014-12-23 10:50:28 +0100
committerPantelis Antoniou <pantelis.antoniou@konsulko.com>2015-01-19 17:04:48 +0200
commit9cf199ebcff13f8d98b31ab48e3bcce37ed8925d (patch)
tree34f4b537c8170fee11fa5a191d0d69d267139d8e /drivers
parent8a0cf4901021b09c283f172d4d29d0d05721b0ba (diff)
downloadu-boot-imx-9cf199ebcff13f8d98b31ab48e3bcce37ed8925d.zip
u-boot-imx-9cf199ebcff13f8d98b31ab48e3bcce37ed8925d.tar.gz
u-boot-imx-9cf199ebcff13f8d98b31ab48e3bcce37ed8925d.tar.bz2
mmc: the ext_csd data may be used during init even if reading failed
The mmc_startup() function uses the ext_csd data even if reading it from the mmc device failed. This bug was introduced in commit bc897b1d4d86597311430dbe7b3e6c807c8c53e5. We now bail out if reading it fails, this should not be a problem as ext_csd was introduced in MMC 4.0 and this code is conditional on MMC >= 4.0. Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/mmc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 403843b..63a1e0c 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -972,7 +972,9 @@ static int mmc_startup(struct mmc *mmc)
if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) {
/* check ext_csd version and capacity */
err = mmc_send_ext_csd(mmc, ext_csd);
- if (!err && (ext_csd[EXT_CSD_REV] >= 2)) {
+ if (err)
+ return err;
+ if (ext_csd[EXT_CSD_REV] >= 2) {
/*
* According to the JEDEC Standard, the value of
* ext_csd's capacity is valid if the value is more