summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/dma.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-01-13 18:10:29 -0800
committerTony Lindgren <tony@atomide.com>2010-01-19 18:17:38 -0800
commit247421fda7a9612f03150aacb90fdad55e9f63d2 (patch)
treeb01e1c792fd91e0891b721b51f712e78adbe323e /arch/arm/plat-omap/dma.c
parente9acb9b64d7fb16c7f69efa85c5707cffd0c7275 (diff)
downloadop-kernel-dev-247421fda7a9612f03150aacb90fdad55e9f63d2.zip
op-kernel-dev-247421fda7a9612f03150aacb90fdad55e9f63d2.tar.gz
OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
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>
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r--arch/arm/plat-omap/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 09d82b3..728c642 100644
--- 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();
OpenPOWER on IntegriCloud