From 96619ce43e06939e138e8b77e25a7218f62d9a94 Mon Sep 17 00:00:00 2001
From: Per Forlin <per.forlin@linaro.org>
Date: Mon, 29 Aug 2011 15:35:59 +0200
Subject: [PATCH] --- yaml --- r: 270269 b: refs/heads/master c:
 8e3336b1e4378f7d205af9b25dcc9e645c8a9609 h: refs/heads/master i:   270267:
 df39b7abc0d08cc8f5a9e61177e4924a37be71ab v: v3

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

diff --git a/[refs] b/[refs]
index 5999e1e4bd6c..2c7fdb8f521d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8a2829c22a270acadc6aa3a937e2e7956b19f5
+refs/heads/master: 8e3336b1e4378f7d205af9b25dcc9e645c8a9609
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 56e9a4168264..40e4c055812e 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -529,7 +529,7 @@ static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
 	if (chan) {
 		if (err)
 			dmaengine_terminate_all(chan);
-		if (err || data->host_cookie)
+		if (data->host_cookie)
 			dma_unmap_sg(mmc_dev(host->mmc), data->sg,
 				     data->sg_len, dir);
 		mrq->data->host_cookie = 0;