Skip to content

Commit

Permalink
dma: shdma: add checking the DMAOR_AE in sh_dmae_err
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Yoshihiro Shimoda authored and Paul Mundt committed Mar 29, 2011
1 parent 89078d5 commit ff7690b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/dma/shdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ff7690b

Please sign in to comment.