summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Soderstedt <fredrik.soderstedt@stericsson.com>2011-12-19 20:14:31 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 08:56:53 +0100
commitdc84273d06bd9a78f951ac56509df64f3581996b (patch)
treeb5340a19c4df2637fe66c97f5b41491229f96cd0
parente9b894b8d741ac0c2a724d39ab1fa2073fb3dafc (diff)
mmc: mmci : Do not use polling for non removable cards
Do not use polling to detect non removable cards. ST-Ericsson ID: 372618 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I18797e5f85d83213bbf520277576425bed4c68f2 Signed-off-by: Fredrik Soderstedt <fredrik.soderstedt@stericsson.com> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/51859
-rw-r--r--drivers/mmc/host/mmci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 543159430bb..18a091cf39d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1512,7 +1512,8 @@ static int __devinit mmci_probe(struct amba_device *dev,
}
if ((host->plat->status || host->gpio_cd != -ENOSYS)
- && host->gpio_cd_irq < 0)
+ && host->gpio_cd_irq < 0
+ && !(mmc->caps & MMC_CAP_NONREMOVABLE))
mmc->caps |= MMC_CAP_NEEDS_POLL;
ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);