git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dma.c
diff --git
a/arch/arm/mach-davinci/dma.c
b/arch/arm/mach-davinci/dma.c
index
2ede598
..
6b96698
100644
(file)
--- a/
arch/arm/mach-davinci/dma.c
+++ b/
arch/arm/mach-davinci/dma.c
@@
-354,10
+354,12
@@
static int irq2ctlr(int irq)
static irqreturn_t dma_irq_handler(int irq, void *data)
{
int i;
static irqreturn_t dma_irq_handler(int irq, void *data)
{
int i;
-
unsigned
ctlr;
+
int
ctlr;
unsigned int cnt = 0;
ctlr = irq2ctlr(irq);
unsigned int cnt = 0;
ctlr = irq2ctlr(irq);
+ if (ctlr < 0)
+ return IRQ_NONE;
dev_dbg(data, "dma_irq_handler\n");
dev_dbg(data, "dma_irq_handler\n");
@@
-408,10
+410,12
@@
static irqreturn_t dma_irq_handler(int irq, void *data)
static irqreturn_t dma_ccerr_handler(int irq, void *data)
{
int i;
static irqreturn_t dma_ccerr_handler(int irq, void *data)
{
int i;
-
unsigned
ctlr;
+
int
ctlr;
unsigned int cnt = 0;
ctlr = irq2ctlr(irq);
unsigned int cnt = 0;
ctlr = irq2ctlr(irq);
+ if (ctlr < 0)
+ return IRQ_NONE;
dev_dbg(data, "dma_ccerr_handler\n");
dev_dbg(data, "dma_ccerr_handler\n");