2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index a6b5fe9d3969..ddddad46b402 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -179,11 +179,11 @@ static int mmc_read_ext_csd(struct mmc_card *card)
 
         err = mmc_send_ext_csd(card, ext_csd);
         if (err) {
-                /*
-                 * We all hosts that cannot perform the command
-                 * to fail more gracefully
-                 */
-                if (err != -EINVAL)
+                /* If the host or the card can't do the switch,
+                 * fail more gracefully. */
+                if ((err != -EINVAL)
+                 && (err != -ENOSYS)
+                 && (err != -EFAULT))
                         goto out;
 
                 /*
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 222a60928cdb..13b3a6b8f5b5 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -210,11 +210,11 @@ static int mmc_read_switch(struct mmc_card *card)
 
         err = mmc_sd_switch(card, 0, 0, 1, status);
         if (err) {
-                /*
-                 * We all hosts that cannot perform the command
-                 * to fail more gracefully
-                 */
-                if (err != -EINVAL)
+                /* If the host or the card can't do the switch,
+                 * fail more gracefully. */
+                if ((err != -EINVAL)
+                 && (err != -ENOSYS)
+                 && (err != -EFAULT))
                         goto out;
 
                 printk(KERN_WARNING "%s: problem reading switch "