From f217e50c9e44013b629e1c3b9751e1c4e6dec7cb Mon Sep 17 00:00:00 2001
From: Manuel Lauss <mano@roarinelk.homelinux.net>
Date: Mon, 9 Jun 2008 08:39:11 +0200
Subject: [PATCH] --- yaml --- r: 102181 b: refs/heads/master c:
 88b8d9a83431237bf3eec1f2968f763607811171 h: refs/heads/master i:   102179:
 d64f2999dcd423c6d42470ba30ada5e96bf1d5c0 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mmc/host/au1xmmc.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0e560853008..a161bf1adec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0a889df56c9f6c5a68ec7aa222082569b35fd9
+refs/heads/master: 88b8d9a83431237bf3eec1f2968f763607811171
diff --git a/trunk/drivers/mmc/host/au1xmmc.c b/trunk/drivers/mmc/host/au1xmmc.c
index fcbaf40e3553..718eb879587f 100644
--- a/trunk/drivers/mmc/host/au1xmmc.c
+++ b/trunk/drivers/mmc/host/au1xmmc.c
@@ -697,6 +697,13 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
 	host->mrq = mrq;
 	host->status = HOST_S_CMD;
 
+	/* fail request immediately if no card is present */
+	if (0 == au1xmmc_card_inserted(host)) {
+		mrq->cmd->error = -ENOMEDIUM;
+		au1xmmc_finish_request(host);
+		return;
+	}
+
 	if (mrq->data) {
 		FLUSH_FIFO(host);
 		ret = au1xmmc_prepare_data(host, mrq->data);