summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c64xx
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-01-03 13:36:39 +0300
committerKukjin Kim <kgene.kim@samsung.com>2011-01-03 13:36:39 +0300
commitf56d463423b825ff5bf4b63e0dc443557934165c (patch)
tree722061d8be283d330a8a3c7a6592b40e2b7dedd3 /arch/arm/mach-s3c64xx
parentf651ef6575d8816143afbad4492584979589bd46 (diff)
parentd03e119c08359f9217154d6a4201689639fe29c8 (diff)
downloadlinux-f56d463423b825ff5bf4b63e0dc443557934165c.tar.xz
Merge branch 'next-s3c64xx' into for-next
Diffstat (limited to 'arch/arm/mach-s3c64xx')
-rw-r--r--arch/arm/mach-s3c64xx/dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index e7d03ab41d80..d9aa072ecee3 100644
--- 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);