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/davinci/davinci-pcm.c | |
parent | Merge branch 'fix/misc' into for-linus (diff) | |
parent | ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream (diff) | |
download | linux-7445c995b06f2a999541ccf127886d24a2a7d012.tar.xz linux-7445c995b06f2a999541ccf127886d24a2a7d012.zip |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 80c7fdf2f521..2dc406f42fe7 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -649,8 +649,10 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) struct snd_pcm_hardware *ppcm; int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params *pa; struct davinci_pcm_dma_params *params; + + pa = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream); if (!pa) return -ENODEV; params = &pa[substream->stream]; |