From 8d1c8c61456b5e7124b2f387a855f225c8f2fa5f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 14 Dec 2009 18:01:20 -0800
Subject: [PATCH] --- yaml --- r: 176390 b: refs/heads/master c:
 3423d80af67a94a641cc3297ec8c0869aa7f197c h: refs/heads/master 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 63e60d61b797..afa4a909bba6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ec64960653c91fa86373d06a079eb7a63deb21f
+refs/heads/master: 3423d80af67a94a641cc3297ec8c0869aa7f197c
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index ec15f1bbf8b9..b4db401874e0 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -820,7 +820,7 @@ static void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch,
 static void finalize_request(struct s3cmci_host *host)
 {
 	struct mmc_request *mrq = host->mrq;
-	struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
+	struct mmc_command *cmd;
 	int debug_as_failure = 0;
 
 	if (host->complete_what != COMPLETION_FINALIZE)
@@ -828,6 +828,7 @@ static void finalize_request(struct s3cmci_host *host)
 
 	if (!mrq)
 		return;
+	cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
 
 	if (cmd->data && (cmd->error == 0) &&
 	    (cmd->data->error == 0)) {