From 34a06b51a1928ed1692da4fce9f2203dfd306648 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 22 Apr 2014 07:26:59 +0200 Subject: [PATCH] sdhci: fix Timeout error messages If the driver doesn't implement proper card detection, we shouldn't flood the console with Timeout error messages Upstream-Status: Pending Signed-off-by: Maxin B. John --- drivers/mmc/host/sdhci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 79db375..c77117c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2149,10 +2149,13 @@ static void sdhci_timeout_timer(unsigned long data) spin_lock_irqsave(&host->lock, flags); if (host->mrq) { - pr_err("%s: Timeout waiting for hardware " + /* If the driver doesn't implement proper card detection, + we shouldn't flood the console with Timeout error messages */ + if (!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)) { + pr_err("%s: Timeout waiting for hardware " "interrupt.\n", mmc_hostname(host->mmc)); - sdhci_dumpregs(host); - + sdhci_dumpregs(host); + } if (host->data) { host->data->error = -ETIMEDOUT; sdhci_finish_data(host); -- 1.7.10.4