diff options
author | Troy Kisky <troy.kisky@boundarydevices.com> | 2009-11-16 18:52:31 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 08:35:06 -0500 |
commit | 57512c6432783c9695ef54f875f705584c65c733 (patch) | |
tree | 0e376074e7804d0116f2fba36111ac5b736b90e0 /sound/soc/davinci/davinci-pcm.c | |
parent | 357a1db94ecc5b3d605574b164d288cd7dbf8dbd (diff) |
ASoC: DaVinci: remove requirement that dma_params is 1st in structure
Remove requirement that dma_params is 1st in the structures
davinci_audio_dev and davinci_mcbsp_dev.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.c')
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index fb10f1d63fdb..187ee965bf0b 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c | |||
@@ -253,10 +253,11 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) | |||
253 | struct davinci_runtime_data *prtd; | 253 | struct davinci_runtime_data *prtd; |
254 | int ret = 0; | 254 | int ret = 0; |
255 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 255 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
256 | struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->private_data; | 256 | struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->dma_data; |
257 | struct davinci_pcm_dma_params *params = &pa[substream->stream]; | 257 | struct davinci_pcm_dma_params *params; |
258 | if (!params) | 258 | if (!pa) |
259 | return -ENODEV; | 259 | return -ENODEV; |
260 | params = &pa[substream->stream]; | ||
260 | 261 | ||
261 | snd_soc_set_runtime_hwparams(substream, &davinci_pcm_hardware); | 262 | snd_soc_set_runtime_hwparams(substream, &davinci_pcm_hardware); |
262 | /* ensure that buffer size is a multiple of period size */ | 263 | /* ensure that buffer size is a multiple of period size */ |