Merge tag 'mmc-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[sfrench/cifs-2.6.git] / drivers / mmc / core / mmc.c

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 55997cf84b39f5dd9c3ced5ea9db6702cb02c65a..da892a599524b9727a3ac1d679333ac36d33c492 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1181,6 +1181,9 @@ static int mmc_select_hs400(struct mmc_card *card)
        if (err)
                goto out_err;
 
+       if (host->ops->hs400_prepare_ddr)
+               host->ops->hs400_prepare_ddr(host);
+
        /* Switch card to DDR */
        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                         EXT_CSD_BUS_WIDTH,
@@ -2011,12 +2014,6 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
        if (mmc_card_suspended(host->card))
                goto out;
 
-       if (mmc_card_doing_bkops(host->card)) {
-               err = mmc_stop_bkops(host->card);
-               if (err)
-                       goto out;
-       }
-
        err = mmc_flush_cache(host->card);
        if (err)
                goto out;