1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index baf3d5da4ccb..d0d9f90e7cdf 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1058,6 +1058,14 @@ retry:
                         mmc_set_bus_width(host, MMC_BUS_WIDTH_4);
                 }
         }
+
+        if (host->caps2 & MMC_CAP2_AVOID_3_3V &&
+            host->ios.signal_voltage == MMC_SIGNAL_VOLTAGE_330) {
+                pr_err("%s: Host failed to negotiate down from 3.3V\n",
+                        mmc_hostname(host));
+                err = -EINVAL;
+                goto free_card;
+        }
 done:
         host->card = card;
         return 0;
@@ -1214,7 +1222,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
         return 0;
 }
 
-static int mmc_sd_reset(struct mmc_host *host)
+static int mmc_sd_hw_reset(struct mmc_host *host)
 {
         mmc_power_cycle(host, host->card->ocr);
         return mmc_sd_init_card(host, host->card->ocr, host->card);
@@ -1229,7 +1237,7 @@ static const struct mmc_bus_ops mmc_sd_ops = {
         .resume = mmc_sd_resume,
         .alive = mmc_sd_alive,
         .shutdown = mmc_sd_suspend,
-        .reset = mmc_sd_reset,
+        .hw_reset = mmc_sd_hw_reset,
 };
 
 /*