diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2009-09-11 14:29:03 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 10:08:57 -0700 |
| commit | 92e2a6f68219f8d4c862b1f29c653b05639e4c06 (patch) | |
| tree | 2a6dedf5568554f1555478e2d6d43eefb692990e /sound/soc/davinci/davinci-pcm.c | |
| parent | 81ac55aa14c863821248d9e82694c79bb556694d (diff) | |
| download | blackbird-op-linux-92e2a6f68219f8d4c862b1f29c653b05639e4c06.tar.gz blackbird-op-linux-92e2a6f68219f8d4c862b1f29c653b05639e4c06.zip | |
ASoC: Davinci: Fix race with cpu_dai->dma_data
This patch removes references to cpu_dai->dma_data.
It makes struct davinci_pcm_dma_params part of
struct davinci_mcbsp_dev or struct davinci_audio_dev.
It removes the unused name variable from davinci_pcm_dma_params.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 002808b27f49..359e99ec7244 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -238,7 +238,8 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream) struct davinci_runtime_data *prtd; int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct davinci_pcm_dma_params *params = rtd->dai->cpu_dai->dma_data; + struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->private_data; + struct davinci_pcm_dma_params *params = &pa[substream->stream]; if (!params) return -ENODEV; |
