diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:26:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:26:00 +0100 |
| commit | 9eb8ae727dcb9f2530a895ee6b3496592853709d (patch) | |
| tree | 2d72cfcad6f9a79074eaf180033706fd8aa600b5 /sound/soc/mxs/mxs-saif.c | |
| parent | 5561f17f2629cdacf5bc43e0f839ca6434db2c20 (diff) | |
| parent | 6f1fd93e304f6f4f8b841e1b0124f3ab4c85ba2e (diff) | |
| download | op-kernel-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.zip op-kernel-dev-9eb8ae727dcb9f2530a895ee6b3496592853709d.tar.gz | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/mxs/mxs-saif.c')
| -rw-r--r-- | sound/soc/mxs/mxs-saif.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index abf4ddf..b563141 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -369,7 +369,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai); - snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param); /* clear error status to 0 for each re-open */ saif->fifo_underrun = 0; @@ -605,6 +604,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai) struct mxs_saif *saif = dev_get_drvdata(dai->dev); snd_soc_dai_set_drvdata(dai, saif); + dai->playback_dma_data = &saif->dma_param; + dai->capture_dma_data = &saif->dma_param; return 0; } |
