aboutsummaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorWolfram Sang2021-06-30 06:16:58 +0200
committerUlf Hansson2021-08-24 10:15:32 +0200
commit8335928849729f8e5f10c1497c67260742f7a8cb (patch)
tree55d2505d690bcd7f240ff14aa853ee18f7b0d832 /drivers/mmc
parent86c639ce08266ed521974038f0592739fec1c11a (diff)
mmc: core: Only print retune error when we don't check for card removal
Skip printing a retune error when we scan for a removed card because we then expect a failed command. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Link: https://lore.kernel.org/r/20210630041658.7574-1-wsa+renesas@sang-engineering.com [Ulf: Rebased patch] Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/core.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 84f39a59a28e..6249c83d616f 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -936,15 +936,17 @@ int mmc_execute_tuning(struct mmc_card *card)
opcode = MMC_SEND_TUNING_BLOCK;
err = host->ops->execute_tuning(host, opcode);
-
- if (err) {
- pr_err("%s: tuning execution failed: %d\n",
- mmc_hostname(host), err);
- } else {
+ if (!err) {
mmc_retune_clear(host);
mmc_retune_enable(host);
+ return 0;
}
+ /* 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);
+
return err;
}