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>

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6c19bba2357004903477a7300582d193b26f2962..4525190d55995b7bcd5fb475c214c5c99b3ba776 100644 (file)
--- 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;
 }