diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
commit | 7445c995b06f2a999541ccf127886d24a2a7d012 (patch) | |
tree | 940cb9cce2e2e3dcbbe3502bf720fd10481769af /sound/soc/atmel/atmel-pcm.c | |
parent | 1172234cbe94658c16bc83e50ca57b5a47085209 (diff) | |
parent | 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 (diff) |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/atmel/atmel-pcm.c')
-rw-r--r-- | sound/soc/atmel/atmel-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index 9ef6b96373f5..3e6628c8e665 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c @@ -180,7 +180,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); runtime->dma_bytes = params_buffer_bytes(params); - prtd->params = rtd->dai->cpu_dai->dma_data; + prtd->params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream); prtd->params->dma_intr_handler = atmel_pcm_dma_irq; prtd->dma_buffer = runtime->dma_addr; |