From 5d813ba3999b942b3600c3c765abe946b1503cc7 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 31 Jan 2012 12:48:59 +0200 Subject: [PATCH] --- yaml --- r: 297493 b: refs/heads/master c: 7f99a4216d68f6d75d5d544aa265d72f193bad7f h: refs/heads/master i: 297491: 54c9d0b4a9be315491978973a5080ad00a648d67 v: v3 --- [refs] | 2 +- trunk/drivers/dma/intel_mid_dma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d129f99109e9..4cbd75854302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63fd6ce71226e5e048e2035ba202b53f89a1825 +refs/heads/master: 7f99a4216d68f6d75d5d544aa265d72f193bad7f diff --git a/trunk/drivers/dma/intel_mid_dma.c b/trunk/drivers/dma/intel_mid_dma.c index 74f70aadf9e4..512e2ab3febb 100644 --- a/trunk/drivers/dma/intel_mid_dma.c +++ b/trunk/drivers/dma/intel_mid_dma.c @@ -1056,7 +1056,8 @@ static irqreturn_t intel_mid_dma_interrupt(int irq, void *data) } err_status &= mid->intr_mask; if (err_status) { - iowrite32(MASK_INTR_REG(err_status), mid->dma_base + MASK_ERR); + iowrite32((err_status << INT_MASK_WE), + mid->dma_base + MASK_ERR); call_tasklet = 1; } if (call_tasklet)