From: Adrian Hunter <adrian.hunter@intel.com>
To: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>,
LKML <linux-kernel@vger.kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>
Subject: [PATCH 1/2] dmaengine: intel_mid_dma: fix error status mask
Date: Tue, 31 Jan 2012 12:48:59 +0200 [thread overview]
Message-ID: <1328006940-9101-2-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1328006940-9101-1-git-send-email-adrian.hunter@intel.com>
The error status mask (MASK_ERR) has the same format as the other
masks (MASK_TFR, MASK_BLOCK etc) and must be cleared the same way.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/dma/intel_mid_dma.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 74f70aa..512e2ab 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/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)
--
1.7.6.4
next prev parent reply other threads:[~2012-01-31 10:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 10:48 [PATCH 0/2] dmaengine: intel_mid_dma: minor fixes Adrian Hunter
2012-01-31 10:48 ` Adrian Hunter [this message]
2012-02-06 11:39 ` [PATCH 1/2] dmaengine: intel_mid_dma: fix error status mask Vinod Koul
2012-02-06 11:51 ` Adrian Hunter
2012-01-31 10:49 ` [PATCH 2/2] dmaengine: intel_mid_dma: move pm_runtime_put Adrian Hunter
2012-02-22 12:44 ` [PATCH 0/2] dmaengine: intel_mid_dma: minor fixes Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328006940-9101-2-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).