From 1598b1fb6bd098b1ea64489598a80c41ce1482ce Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 30 Jun 2008 22:40:31 +0100
Subject: [PATCH] --- yaml --- r: 102199 b: refs/heads/master c:
 7c14450ed6ab4ed453b2bf216ca3aaa7a5402af3 h: refs/heads/master i:   102197:
 fd3001f8f556665075595a09745c383208f9049d   102195:
 28c1930a0d131c07db6bd05ecad703f0bdabd736   102191:
 62cbd1bce6ffbdbc52c22249aa2edff241a6cbaf v: v3

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

diff --git a/[refs] b/[refs]
index e818aee08ef2..bfd775595709 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf0984c8edf63017fcc2ead212ca057877e345df
+refs/heads/master: 7c14450ed6ab4ed453b2bf216ca3aaa7a5402af3
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index 4fd11d8864eb..ffd9269a1874 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -353,7 +353,8 @@ static void pio_tasklet(unsigned long data)
 			    (host->pio_active == XFER_READ) ? "read" : "write",
 			    host->pio_count, host->pio_words);
 
-			host->mrq->data->error = -EINVAL;
+			if (host->mrq->data)
+				host->mrq->data->error = -EINVAL;
 		}
 
 		finalize_request(host);