diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 21:21:01 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 21:21:01 -0500 |
| commit | b2d959173fea3e04229b2ff33473b5a031669f66 (patch) | |
| tree | 3c034551b406c8e8b20deeb0197273e06017c11b /arch/arm/plat-omap/dma.c | |
| parent | ccaae273c3f92d7e7acb796d6747077a93dcca4b (diff) | |
| parent | 1daa8c1d75876f690ed8d3f13c806034af5984eb (diff) | |
Merge branch 'omap-fixes' into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 09d82b3c66ce..728c64204184 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) | |||
| 1183 | } | 1183 | } |
| 1184 | 1184 | ||
| 1185 | if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || | 1185 | if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || |
| 1186 | (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { | 1186 | (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) { |
| 1187 | printk(KERN_ERR "omap_dma: You need to stop the DMA channels " | 1187 | printk(KERN_ERR "omap_dma: You need to stop the DMA channels " |
| 1188 | "before unlinking\n"); | 1188 | "before unlinking\n"); |
| 1189 | dump_stack(); | 1189 | dump_stack(); |