---

yaml --- r: 297835 b: refs/heads/master c: 41ba6b7 h: refs/heads/master i: 297833: aff4230 297831: ac74fed v: v3
git-mirror · Mar 26, 2012 · 7d88d2b · 7d88d2b
1 parent c57b785
commit 7d88d2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;