Merge branch 'next-s3c64xx' into for-next

f56d4634 · Kukjin Kim · f651ef65 · d03e119c · f56d4634
Commit f56d4634 authored Jan 03, 2011 by Kukjin Kim
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

arch/arm/mach-s3c64xx/dma.c arch/arm/mach-s3c64xx/dma.c +1 -0

No files found.
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -212,6 +212,7 @@ static int s3c64xx_dma_start(struct s3c2410_dma_chan *chan)

 	config = readl(chan->regs + PL080S_CH_CONFIG);
 	config |= PL080_CONFIG_ENABLE;
+	config &= ~PL080_CONFIG_HALT;

 	pr_debug("%s: writing config %08x\n", __func__, config);
 	writel(config, chan->regs + PL080S_CH_CONFIG);