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-mcasp.h | |
| parent | 81ac55aa14c863821248d9e82694c79bb556694d (diff) | |
| download | op-kernel-dev-92e2a6f68219f8d4c862b1f29c653b05639e4c06.zip op-kernel-dev-92e2a6f68219f8d4c862b1f29c653b05639e4c06.tar.gz | |
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-mcasp.h')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 554354c..9d179cc 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -39,10 +39,15 @@ enum { }; struct davinci_audio_dev { + /* + * dma_params must be first because rtd->dai->cpu_dai->private_data + * is cast to a pointer of an array of struct davinci_pcm_dma_params in + * davinci_pcm_open. + */ + struct davinci_pcm_dma_params dma_params[2]; void __iomem *base; int sample_rate; struct clk *clk; - struct davinci_pcm_dma_params *dma_params[2]; unsigned int codec_fmt; /* McASP specific data */ |
