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

[linux-2.6-microblaze.git] / drivers / mmc / core / core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 605f5e8..240c5af 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -936,15 +936,16 @@ int mmc_execute_tuning(struct mmc_card *card)
                opcode = MMC_SEND_TUNING_BLOCK;
 
        err = host->ops->execute_tuning(host, opcode);
+       if (!err) {
+               mmc_retune_clear(host);
+               mmc_retune_enable(host);
+               return 0;
+       }
 
-       if (err) {
+       /* Only print error when we don't check for card removal */
+       if (!host->detect_change)
                pr_err("%s: tuning execution failed: %d\n",
                        mmc_hostname(host), err);
-       } else {
-               host->retune_now = 0;
-               host->need_retune = 0;
-               mmc_retune_enable(host);
-       }
 
        return err;
 }