diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /sound/atmel/abdac.c | |
parent | ALSA: HDA: Remove quirk for Toshiba Qosmio G50 (diff) | |
parent | Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff) | |
download | linux-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.xz linux-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/atmel/abdac.c')
-rw-r--r-- | sound/atmel/abdac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 6fd9391b3a6c..4fa1dbd8ee83 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -133,7 +133,7 @@ static int atmel_abdac_prepare_dma(struct atmel_abdac *dac, period_len = frames_to_bytes(runtime, runtime->period_size); cdesc = dw_dma_cyclic_prep(chan, runtime->dma_addr, buffer_len, - period_len, DMA_TO_DEVICE); + period_len, DMA_MEM_TO_DEV); if (IS_ERR(cdesc)) { dev_dbg(&dac->pdev->dev, "could not prepare cyclic DMA\n"); return PTR_ERR(cdesc); |