* [PATCH v2] dma: shdma: add checking the DMAOR_AE in sh_dmae_err
@ 2011-02-09 7:46 Yoshihiro Shimoda
2011-02-09 8:27 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Yoshihiro Shimoda @ 2011-02-09 7:46 UTC (permalink / raw)
To: linux-sh
The irq numbers of tranfer end and address error are assigned same number
on some CPU. So the sh_dmae_err() should check the AE flag in DMAOR.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
about v2:
- remove unnecessary cast
drivers/dma/shdma.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 28720d3..3e4c627 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -865,7 +865,12 @@ static unsigned int sh_dmae_reset(struct sh_dmae_device *shdev)
static irqreturn_t sh_dmae_err(int irq, void *data)
{
- return IRQ_RETVAL(sh_dmae_reset(data));
+ struct sh_dmae_device *shdev = data;
+
+ if (dmaor_read(shdev) & DMAOR_AE)
+ return IRQ_RETVAL(sh_dmae_reset(data));
+ else
+ return IRQ_NONE;
}
static void dmae_do_tasklet(unsigned long data)
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] dma: shdma: add checking the DMAOR_AE in sh_dmae_err
2011-02-09 7:46 [PATCH v2] dma: shdma: add checking the DMAOR_AE in sh_dmae_err Yoshihiro Shimoda
@ 2011-02-09 8:27 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-02-09 8:27 UTC (permalink / raw)
To: linux-sh
On Wed, Feb 09, 2011 at 04:46:47PM +0900, Yoshihiro Shimoda wrote:
> The irq numbers of tranfer end and address error are assigned same number
> on some CPU. So the sh_dmae_err() should check the AE flag in DMAOR.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Thanks for cleaning it up! Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-09 8:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 7:46 [PATCH v2] dma: shdma: add checking the DMAOR_AE in sh_dmae_err Yoshihiro Shimoda
2011-02-09 8:27 ` Paul Mundt
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).