diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 13:24:02 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 13:24:02 +0000 |
| commit | bbba75606963c82febf7bd2761ea848ac5d1a1bb (patch) | |
| tree | 50880b4539c578c407f6c1aa605fddf5e371bb7e /arch/arm/mach-s3c64xx/dma.c | |
| parent | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (diff) | |
| parent | ccbc87693dcb428443a72d644e63484676517c2d (diff) | |
| download | op-kernel-dev-bbba75606963c82febf7bd2761ea848ac5d1a1bb.zip op-kernel-dev-bbba75606963c82febf7bd2761ea848ac5d1a1bb.tar.gz | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c64xx/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index e7d03ab..d9aa072 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); |
