OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9acb9b
)
OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
author
Roel Kluin
<roel.kluin@gmail.com>
Thu, 14 Jan 2010 02:10:29 +0000
(18:10 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jan 2010 02:17:38 +0000
(18:17 -0800)
The same flag and bits were tested twice.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/dma.c
patch
|
blob
|
history
diff --git
a/arch/arm/plat-omap/dma.c
b/arch/arm/plat-omap/dma.c
index
09d82b3
..
728c642
100644
(file)
--- a/
arch/arm/plat-omap/dma.c
+++ b/
arch/arm/plat-omap/dma.c
@@
-1183,7
+1183,7
@@
void omap_dma_unlink_lch(int lch_head, int lch_queue)
}
if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) ||
- (dma_chan[lch_
head
].flags & OMAP_DMA_ACTIVE)) {
+ (dma_chan[lch_
queue
].flags & OMAP_DMA_ACTIVE)) {
printk(KERN_ERR "omap_dma: You need to stop the DMA channels "
"before unlinking\n");
dump_stack();