diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-04-16 14:46:15 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-18 19:00:35 +0200 |
| commit | 3fe856b3127744ce30d4369ba760459b6ac9f820 (patch) | |
| tree | 3d099dc29aa2ae004d937cbedc3f849ef284c45f /sound/soc/omap/omap-mcbsp.c | |
| parent | ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loading (diff) | |
| download | linux-3fe856b3127744ce30d4369ba760459b6ac9f820.tar.xz linux-3fe856b3127744ce30d4369ba760459b6ac9f820.zip | |
ASoC: omap-mcbsp: Assign the dai DMA data at earlier time
Assign the dai dma data at dai driver probe time, not in startup.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 6c19bba23570..4525190d5599 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -149,9 +149,6 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 2); } - snd_soc_dai_set_dma_data(cpu_dai, substream, - &mcbsp->dma_data[substream->stream]); - return err; } @@ -559,6 +556,10 @@ static int omap_mcbsp_probe(struct snd_soc_dai *dai) pm_runtime_enable(mcbsp->dev); + snd_soc_dai_init_dma_data(dai, + &mcbsp->dma_data[SNDRV_PCM_STREAM_PLAYBACK], + &mcbsp->dma_data[SNDRV_PCM_STREAM_CAPTURE]); + return 0; } |