aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-04-07 05:18:17 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-04-07 05:18:17 -0700
commitffbfa10bf94aaa340f44153dc25cca730bcc1fe2 (patch)
tree5bf364e9174dfd5e677a608258b56d956d8df98d
parent02ea1307ccfb0f7b24a2936483b51b41510d7db1 (diff)
parent66385ea2bfad85dcf7b9f4204aac668e5fa354be (diff)
Merge "mmc: sdhci: Fix issue with host op card_event()"
-rw-r--r--drivers/mmc/host/sdhci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0aabec32fe1..9b28aceced7 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2542,6 +2542,9 @@ static void sdhci_card_event(struct mmc_host *mmc)
struct sdhci_host *host = mmc_priv(mmc);
unsigned long flags;
+ if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
+ return;
+
spin_lock_irqsave(&host->lock, flags);
/* Check host->mrq first in case we are runtime suspended */