diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2014-04-16 15:46:17 +0300 |
|---|---|---|
| committer | Darren Etheridge <detheridge@ti.com> | 2014-06-20 15:07:39 -0500 |
| commit | c8a05230d22ad4d20c9db6c14243fcccd0918300 (patch) | |
| tree | 0fd28b3bfd06ef314bdccaffdde8d8675016e92c /sound | |
| parent | 43f377b73208b3b16795b00dbc6da09bf7d41ac9 (diff) | |
ASoC: omap-dmic: Assign the dai DMA data at earlier time
[ Upstream commit 3802a259272e48870b8d7e02c4fc28f938a699cb ]
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>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 1bd531d718f..7fb7703264f 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -113,7 +113,6 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream, mutex_unlock(&dmic->mutex); - snd_soc_dai_set_dma_data(dai, substream, &dmic->dma_data); return ret; } @@ -417,6 +416,9 @@ static int omap_dmic_probe(struct snd_soc_dai *dai) /* Configure DMIC threshold value */ dmic->threshold = OMAP_DMIC_THRES_MAX - 3; + + snd_soc_dai_init_dma_data(dai, NULL, &dmic->dma_data); + return 0; } |