diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2010-09-27 09:42:20 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-10-23 21:11:15 +0800 |
| commit | 176d1ed426a2a73a87c62a8aa05f6d002353cd50 (patch) | |
| tree | 0e15db36987071f8dd4b00363d3c35401b8f9c1c /drivers/mmc/host/sdhci.c | |
| parent | 71d7d3d190fe77588269a8febf93cd739bd91eb3 (diff) | |
| download | kernel_samsung_smdk4412-176d1ed426a2a73a87c62a8aa05f6d002353cd50.zip kernel_samsung_smdk4412-176d1ed426a2a73a87c62a8aa05f6d002353cd50.tar.gz kernel_samsung_smdk4412-176d1ed426a2a73a87c62a8aa05f6d002353cd50.tar.bz2 | |
mmc: sdhci: disable MMC_CAP_NEEDS_POLL in nonremovable case
When a controller requires SDHCI_QUIRK_BROKEN_CARD_DETECTION, we poll
for card insertion/removal, and that creates interrupts. There's no
need to be doing this if we have a non-removable card.
This patch requires cards to be removable before we're willing to set
MMC_CAP_NEEDS_POLL.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Matt Fleming <matt@console-pimps.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
[cjb: modified changelog and code indentation]
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 829e78a..96c7f60 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1849,7 +1849,8 @@ int sdhci_add_host(struct sdhci_host *host) if (caps & SDHCI_CAN_DO_HISPD) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; - if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) + if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && + mmc_card_is_removable(mmc)) mmc->caps |= MMC_CAP_NEEDS_POLL; mmc->ocr_avail = 0; |