Merge tag '5.2-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux.git] / drivers / mmc / core / mmc.c

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 3e786ba204c3fd63a4f6b10b9f7acefb41276a88..671bfcceea6a6c1191014aa77e4ee9eccb0c9197 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1212,13 +1212,13 @@ static int mmc_select_hs400(struct mmc_card *card)
        mmc_set_timing(host, MMC_TIMING_MMC_HS400);
        mmc_set_bus_speed(card);
 
+       if (host->ops->hs400_complete)
+               host->ops->hs400_complete(host);
+
        err = mmc_switch_status(card);
        if (err)
                goto out_err;
 
-       if (host->ops->hs400_complete)
-               host->ops->hs400_complete(host);
-
        return 0;
 
 out_err: