summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorManuel Lauss <mano@roarinelk.homelinux.net>2008-06-09 08:39:11 +0200
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 14:14:43 +0200
commit88b8d9a83431237bf3eec1f2968f763607811171 (patch)
treedccda694012ecf0a054fba2952e5e1c84969c2e8 /drivers/mmc/host
parent5c0a889df56c9f6c5a68ec7aa222082569b35fd9 (diff)
au1xmmc: abort requests early if no card is present.
Don't process an MMC request if no card is present. Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/au1xmmc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index fcbaf40e355..718eb879587 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/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);