From 7d88d2b9aa09ca4d39f4aa6aa3b50a77b1a6bc1a Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Mon, 26 Mar 2012 17:28:08 +0530 Subject: [PATCH] --- yaml --- r: 297835 b: refs/heads/master c: 41ba6b711a40b83a877ae8242a4b3e692de91f97 h: refs/heads/master i: 297833: aff42309d39e9485532a169e6128006990056fe6 297831: ac74fedd6c273e76ed042f4ee5472dfbb455f94a v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dmaengine-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 644442e14993..7c1c5f5bb6bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a163c82d600e554ef79e931db6315026e1fc819 +refs/heads/master: 41ba6b711a40b83a877ae8242a4b3e692de91f97 diff --git a/trunk/sound/soc/soc-dmaengine-pcm.c b/trunk/sound/soc/soc-dmaengine-pcm.c index 76c038b4a970..475695234b3d 100644 --- a/trunk/sound/soc/soc-dmaengine-pcm.c +++ b/trunk/sound/soc/soc-dmaengine-pcm.c @@ -143,10 +143,10 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) direction = snd_pcm_substream_to_dma_direction(substream); prtd->pos = 0; - desc = chan->device->device_prep_dma_cyclic(chan, + desc = dmaengine_prep_dma_cyclic(chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), - snd_pcm_lib_period_bytes(substream), direction, NULL); + snd_pcm_lib_period_bytes(substream), direction); if (!desc) return -ENOMEM;