Commit 176d1ed4 authored Sep 27, 2010 by Jaehoon Chung Committed by Chris Ball Oct 23, 2010

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>

parent 71d7d3d1

drivers/mmc/host/sdhci.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1849,7 +1849,8 @@ int sdhci_add_host(struct sdhci_host *host)
	if (caps & SDHCI_CAN_DO_HISPD)		if (caps & SDHCI_CAN_DO_HISPD)
	mmc->caps \|= MMC_CAP_SD_HIGHSPEED \| MMC_CAP_MMC_HIGHSPEED;		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->caps \|= MMC_CAP_NEEDS_POLL;

	mmc->ocr_avail = 0;		mmc->ocr_avail = 0;

Admin message