diff options
| author | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2011-02-09 02:46:47 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-29 02:53:31 -0400 |
| commit | ff7690b48ae8571d930a2621e21f6e5a41e42b6d (patch) | |
| tree | 5909d3f9014cdf842d8ccdc584c752eaa7499a02 | |
| parent | 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f (diff) | |
dma: shdma: add checking the DMAOR_AE in sh_dmae_err
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>
| -rw-r--r-- | 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 6451b581a70b..d50da41ac328 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) | |||
| 865 | 865 | ||
| 866 | static irqreturn_t sh_dmae_err(int irq, void *data) | 866 | static irqreturn_t sh_dmae_err(int irq, void *data) |
| 867 | { | 867 | { |
| 868 | return IRQ_RETVAL(sh_dmae_reset(data)); | 868 | struct sh_dmae_device *shdev = data; |
| 869 | |||
| 870 | if (dmaor_read(shdev) & DMAOR_AE) | ||
| 871 | return IRQ_RETVAL(sh_dmae_reset(data)); | ||
| 872 | else | ||
| 873 | return IRQ_NONE; | ||
| 869 | } | 874 | } |
| 870 | 875 | ||
| 871 | static void dmae_do_tasklet(unsigned long data) | 876 | static void dmae_do_tasklet(unsigned long data) |
