alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ASoC: samsung: Ensure DMA data is initialised for secondary DAI
@ 2013-12-05 14:13 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2013-12-05 14:13 UTC (permalink / raw)
  To: Padmavathi Venna
  Cc: alsa-devel, linux-samsung-soc, linaro-kernel, Mark Brown, stable

From: Mark Brown <broonie@linaro.org>

While testing the upcoming dmaengine conversion for the driver Padma
noticed that the DMA data for the secondard DAI is not being correctly
initialised and provided a fix on top of the conversion.  Also do this
fix for mainline.

Reported-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
---

Compile tested only, I don't have hardware to test.

 sound/soc/samsung/i2s.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index a5cbdb4f1655..f9f2227421ea 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -946,8 +946,11 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
 	struct i2s_dai *i2s = to_info(dai);
 	struct i2s_dai *other = i2s->pri_dai ? : i2s->sec_dai;
 
-	if (other && other->clk) /* If this is probe on secondary */
+	if (other && other->clk) { /* If this is probe on secondary */
+		snd_soc_dai_init_dma_data(dai, &other->sec_dai->dma_playback,
+					  NULL);
 		goto probe_exit;
+	}
 
 	i2s->addr = ioremap(i2s->base, 0x100);
 	if (i2s->addr == NULL) {
-- 
1.8.5.1

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-12-05 14:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-05 14:13 [PATCH] ASoC: samsung: Ensure DMA data is initialised for secondary DAI Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).