From ba55e59ba825a191ee5541d03d2a7dcdd9408808 Mon Sep 17 00:00:00 2001
From: Roman Moracik <roman.moravcik@gmail.com>
Date: Mon, 30 Jun 2008 22:40:28 +0100
Subject: [PATCH] --- yaml --- r: 102196 b: refs/heads/master c:
 d643b5f7e0793ef7828a35a5ea049d675ad2ad8c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mmc/host/s3cmci.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c5108092319a..7bf14727bbde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdbc9c3a8f7a7956611c970e262693faa95081a5
+refs/heads/master: d643b5f7e0793ef7828a35a5ea049d675ad2ad8c
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index 8c68b2e0dd6e..774af3d7218f 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -335,6 +335,8 @@ static void pio_tasklet(unsigned long data)
 	struct s3cmci_host *host = (struct s3cmci_host *) data;
 
 
+	disable_irq(host->irq);
+
 	if (host->pio_active == XFER_WRITE)
 		do_pio_write(host);
 
@@ -352,9 +354,9 @@ static void pio_tasklet(unsigned long data)
 			host->mrq->data->error = -EINVAL;
 		}
 
-		disable_irq(host->irq);
 		finalize_request(host);
-	}
+	} else
+		enable_irq(host->irq);
 }
 
 /*
@@ -630,7 +632,6 @@ void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
 	spin_unlock_irqrestore(&host->complete_lock, iflags);
 	return;
 
-
 fail_request:
 	host->mrq->data->error = -EINVAL;
 	host->complete_what = COMPLETION_FINALIZE;