1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 732c3171cec..fc65475a26e 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -618,6 +618,12 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
 
         /* Set current limit for the card */
         err = sd_set_current_limit(card, status);
+        if (err)
+                goto out;
+
+        /* SPI mode doesn't define CMD19 */
+        if (!mmc_host_is_spi(card->host) && card->host->ops->execute_tuning)
+                err = card->host->ops->execute_tuning(card->host);
 
 out:
         kfree(status);