git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm
/
mach-imx
/
dma.c
diff --git
a/arch/arm/mach-imx/dma.c
b/arch/arm/mach-imx/dma.c
index
7387ccb
..
2a44d53
100644
(file)
--- a/
arch/arm/mach-imx/dma.c
+++ b/
arch/arm/mach-imx/dma.c
@@
-136,7
+136,7
@@
dma_err_handler(int irq, void *dev_id, struct pt_regs *regs)
i, channel->name);
DBOSR |= (1 << i);
}
- DISR
|
= (1 << i);
+ DISR = (1 << i);
}
return IRQ_HANDLED;
}
@@
-158,10
+158,10
@@
dma_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
*/
printk(KERN_WARNING
"spurious IRQ for DMA channel %d\n", i);
- DISR |= (1 << i);
}
}
}
+ DISR = disr;
return IRQ_HANDLED;
}