From ab99768d75ab83548794972c037b6ba9d3f7624d Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Sat, 15 Mar 2008 16:00:38 +0100
Subject: [PATCH] --- yaml --- r: 87391 b: refs/heads/master c:
 ce636452343af0522d2666157dab9c2096f4f996 h: refs/heads/master i:   87389:
 a01cb25892173777309c1cb049fe63ec2168ff65   87387:
 7b2b98659aaab6976301e8ae27ef5dc1f0f97af6   87383:
 ccdb35493a746413b024f2fb71c76ee4c2feb064   87375:
 4756aab340ebc2fb3188360818dd1b92239813d3   87359:
 ffd985ff2be6a8eddfdc11d6c0bed19773202cc2 v: v3

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

diff --git a/[refs] b/[refs]
index 974975818919..8329e188edff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afbf331ed1252c85753ac6790356c11e171f3d0b
+refs/heads/master: ce636452343af0522d2666157dab9c2096f4f996
diff --git a/trunk/drivers/mmc/host/tifm_sd.c b/trunk/drivers/mmc/host/tifm_sd.c
index 20d5c7bd940a..1c14a186f000 100644
--- a/trunk/drivers/mmc/host/tifm_sd.c
+++ b/trunk/drivers/mmc/host/tifm_sd.c
@@ -180,7 +180,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host)
 			host->sg_pos++;
 			if (host->sg_pos == host->sg_len) {
 				if ((r_data->flags & MMC_DATA_WRITE)
-				    && DATA_CARRY)
+				    && (host->cmd_flags & DATA_CARRY))
 					writel(host->bounce_buf_data[0],
 					       host->dev->addr
 					       + SOCK_MMCSD_DATA);