From fa427e26953546d7fb092ed9267d968b9a207823 Mon Sep 17 00:00:00 2001
From: Venkatraman S <svenkatr@ti.com>
Date: Tue, 10 Aug 2010 18:01:54 -0700
Subject: [PATCH] --- yaml --- r: 208439 b: refs/heads/master c:
 f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab h: refs/heads/master i:   208437:
 91c1dd8b3f4c73fec07a87c796f9602778fb2bf8   208435:
 0db99a97a5ed09b1335df5cb560ee091fda07176   208431:
 71bca38e67a9ee9df3b617023e741ab77de3adf8 v: v3

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

diff --git a/[refs] b/[refs]
index 5b2e3bbe781c..0db5258e2caf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 762333e344144283a9da97a34b5dded51ff61b27
+refs/heads/master: f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab
diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c
index ee1a3093048e..dc57ef6aef4f 100644
--- a/trunk/drivers/mmc/host/omap_hsmmc.c
+++ b/trunk/drivers/mmc/host/omap_hsmmc.c
@@ -1273,8 +1273,11 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data)
 	struct mmc_data *data = host->mrq->data;
 	int dma_ch, req_in_progress;
 
-	if (ch_status & OMAP2_DMA_MISALIGNED_ERR_IRQ)
-		dev_dbg(mmc_dev(host->mmc), "MISALIGNED_ADRS_ERR\n");
+	if (!(ch_status & OMAP_DMA_BLOCK_IRQ)) {
+		dev_warn(mmc_dev(host->mmc), "unexpected dma status %x\n",
+			ch_status);
+		return;
+	}
 
 	spin_lock(&host->irq_lock);
 	if (host->dma_ch < 0) {