1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e0bfa9515c8a..a6b5fe9d3969 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -416,12 +416,17 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 (host->caps & MMC_CAP_MMC_HIGHSPEED)) {
                 err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                         EXT_CSD_HS_TIMING, 1);
-                if (err)
+                if (err && err != -EBADMSG)
                         goto free_card;
 
-                mmc_card_set_highspeed(card);
-
-                mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
+                if (err) {
+                        printk(KERN_WARNING "%s: switch to highspeed failed\n",
+                               mmc_hostname(card->host));
+                        err = 0;
+                } else {
+                        mmc_card_set_highspeed(card);
+                        mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
+                }
         }
 
         /*
@@ -456,10 +461,17 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                  EXT_CSD_BUS_WIDTH, ext_csd_bit);
 
-                if (err)
+                if (err && err != -EBADMSG)
                         goto free_card;
 
-                mmc_set_bus_width(card->host, bus_width);
+                if (err) {
+                        printk(KERN_WARNING "%s: switch to bus width %d "
+                               "failed\n", mmc_hostname(card->host),
+                               1 << bus_width);
+                        err = 0;
+                } else {
+                        mmc_set_bus_width(card->host, bus_width);
+                }
         }
 
         if (!oldcard)