MMC: S3C24XX: Add media presence test to request handling.

Ensure that we have physical media present before attempting to
send a request to a card. This ensures that we do not get flooded
by errors from commands that can never be completed timing out.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 6f1b474e33b9..62d73d3497f0 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -984,6 +984,18 @@ static void s3cmci_send_request(struct mmc_host *mmc)
         enable_irq(host->irq);
 }
 
+static int s3cmci_card_present(struct s3cmci_host *host)
+{
+        struct s3c24xx_mci_pdata *pdata = host->pdata;
+        int ret;
+
+        if (pdata->gpio_detect == 0)
+                return -ENOSYS;
+
+        ret = s3c2410_gpio_getpin(pdata->gpio_detect) ? 0 : 1;
+        return ret ^ pdata->detect_invert;
+}
+
 static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
         struct s3cmci_host *host = mmc_priv(mmc);
@@ -992,7 +1004,12 @@ static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         host->cmd_is_stop = 0;
         host->mrq = mrq;
 
-        s3cmci_send_request(mmc);
+        if (s3cmci_card_present(host) == 0) {
+                dbg(host, dbg_err, "%s: no medium present\n", __func__);
+                host->mrq->cmd->error = -ENOMEDIUM;
+                mmc_request_done(mmc, mrq);
+        } else
+                s3cmci_send_request(mmc);
 }
 
 static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)