mmc: check status after MMC SWITCH command

According to the standard, the SWITCH command should be followed by a
SEND_STATUS command to check for errors.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: Matt Fleming <matt@console-pimps.org>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Philip Langdale <philipl@overt.org>
Cc: "Madhusudhan" <madhu.cr@ti.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 355c6042cf65..d2cb5c634392 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -390,6 +390,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
 {
         int err;
         struct mmc_command cmd;
+        u32 status;
 
         BUG_ON(!card);
         BUG_ON(!card->host);
@@ -407,6 +408,28 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
         if (err)
                 return err;
 
+        /* Must check status to be sure of no errors */
+        do {
+                err = mmc_send_status(card, &status);
+                if (err)
+                        return err;
+                if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
+                        break;
+                if (mmc_host_is_spi(card->host))
+                        break;
+        } while (R1_CURRENT_STATE(status) == 7);
+
+        if (mmc_host_is_spi(card->host)) {
+                if (status & R1_SPI_ILLEGAL_COMMAND)
+                        return -EBADMSG;
+        } else {
+                if (status & 0xFDFFA000)
+                        printk(KERN_WARNING "%s: unexpected status %#x after "
+                               "switch", mmc_hostname(card->host), status);
+                if (status & R1_SWITCH_ERROR)
+                        return -EBADMSG;
+        }
+
         return 0;
 }