mmc: sdhci: prevent card detection activity for non-removable cards

Do not enable card detection interrupts for non-removable cards.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Adrian Hunter 2011-12-27 15:48:42 +02:00 committed by Chris Ball
parent ceb6143b2d
commit c79396c191

View file

@ -146,10 +146,9 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
{ {
u32 present, irqs; u32 present, irqs;
if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||
return; (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) ||
!mmc_card_is_removable(host->mmc))
if (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION)
return; return;
present = sdhci_readl(host, SDHCI_PRESENT_STATE) & present = sdhci_readl(host, SDHCI_PRESENT_STATE) &