From 3d6e4f64a90993838c5beaa05c9f23735df77bfc Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Mon, 9 Aug 2010 12:56:40 +0100
Subject: [PATCH] --- yaml --- r: 212426 b: refs/heads/master c:
 4b8caec09562ce7e6e3aaf2954eef8ea73ba67b8 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/host/mmci.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2ca05eacbcba..61315cc21985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 148b8b39c156424da22693d26adcb69800faf95e
+refs/heads/master: 4b8caec09562ce7e6e3aaf2954eef8ea73ba67b8
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index a922a0028836..fd89d9230928 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -589,9 +589,12 @@ static int mmci_get_cd(struct mmc_host *mmc)
 	struct mmci_platform_data *plat = host->plat;
 	unsigned int status;
 
-	if (host->gpio_cd == -ENOSYS)
+	if (host->gpio_cd == -ENOSYS) {
+		if (!plat->status)
+			return 1; /* Assume always present */
+
 		status = plat->status(mmc_dev(host->mmc));
-	else
+	} else
 		status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert;
 
 	/*
@@ -787,7 +790,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
 			goto err_gpio_wp;
 	}
 
-	if (host->gpio_cd_irq < 0)
+	if ((host->plat->status || host->gpio_cd != -ENOSYS)
+	    && host->gpio_cd_irq < 0)
 		mmc->caps |= MMC_CAP_NEEDS_POLL;
 
 	ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);