[MMC] Proper check of SCR error code

The routine reading the SCR wasn't paying proper attention to the
error codes returned from the driver.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d336a1d65dc7..b586a83a9b4c 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -932,8 +932,9 @@ static void mmc_read_scrs(struct mmc_host *host)
 
                 sg_init_one(&sg, (u8*)card->raw_scr, 8);
 
-                err = mmc_wait_for_req(host, &mrq);
-                if (err != MMC_ERR_NONE) {
+                mmc_wait_for_req(host, &mrq);
+
+                if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
                         mmc_card_set_dead(card);
                         continue;
                 }