summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatraman S <svenkatr@ti.com>2010-08-11 03:01:54 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 17:59:04 +0200
commitf3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab (patch)
tree9d56c5f9434e999ab361ad50499b0987211f4c38
parentdrivers/mmc/host/msm-sdcc: remove dead config options (diff)
downloadlinux-f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab.tar.xz
linux-f3584e5e6fd7abda4ef4a7aec9acd9d46387b8ab.zip
omap hsmmc: fix processing of all dma interrupts as block completion
If other informative interrupts are enabled for the DMA channel used by hsmmc, those are incorrectly treated as block completion. This patch lets only the block completion interrupt to be processed. Signed-off-by: Venkatraman S <svenkatr@ti.com> Acked-by: Madhusudhan Chikkature <madhu.cr@ti.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/mmc/host/omap_hsmmc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index ee1a3093048e..dc57ef6aef4f 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/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) {