Skip to contentSkip to conversation

ASoC: kirkwood: prevent double streaming

PATCH In review Jean-Francois Moine 2 participants 2 messages Jul 21, 2015 – Jul 22, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: kirkwood: prevent double streaming

The kirkwood audio subsystem presents 2 PCM's for one source. Streaming on a second PCM while the first one is active cuts this last one.
Then, ending the last stream gives a kernel trap in free_irq().

---
 sound/soc/kirkwood/kirkwood-dma.c | 4 ++++
 1 file changed, 4 insertions(+)
sound/soc/kirkwood/kirkwood-dma.c +4 -0
index 4cf2245..dbfdfe9 100644
@@ -148,10 +148,14 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
 	dram = mv_mbus_dram_info();
 	addr = substream->dma_buffer.addr;
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		if (priv->substream_play)
+			return -EBUSY;
 		priv->substream_play = substream;
 		kirkwood_dma_conf_mbus_windows(priv->io,
 			KIRKWOOD_PLAYBACK_WIN, addr, dram);
 	} else {
+		if (priv->substream_rec)
+			return -EBUSY;
 		priv->substream_rec = substream;
 		kirkwood_dma_conf_mbus_windows(priv->io,
 			KIRKWOOD_RECORD_WIN, addr, dram);
Signature · 1 line
2.1.4
maintainer
#1 lore raw

Applied "ASoC: kirkwood: prevent double streaming" to the asoc tree

The patch

ASoC: kirkwood: prevent double streaming

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From c4a42915d84ad4b5b5e13aeed5da67f458e22399 Mon Sep 17 00:00:00 2001

From: Jean-Francois Moine <[email protected]>
Date: Tue, 21 Jul 2015 18:32:58 +0200
Subject: [PATCH] ASoC: kirkwood: prevent double streaming

The kirkwood audio subsystem presents 2 PCM's for one source. Streaming on a second PCM while the first one is active cuts this last one.
Then, ending the last stream gives a kernel trap in free_irq().

---
 sound/soc/kirkwood/kirkwood-dma.c | 4 ++++
 1 file changed, 4 insertions(+)
sound/soc/kirkwood/kirkwood-dma.c +4 -0
index 4cf2245950d7..dbfdfe99c69d 100644
@@ -148,10 +148,14 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
 	dram = mv_mbus_dram_info();
 	addr = substream->dma_buffer.addr;
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+		if (priv->substream_play)
+			return -EBUSY;
 		priv->substream_play = substream;
 		kirkwood_dma_conf_mbus_windows(priv->io,
 			KIRKWOOD_PLAYBACK_WIN, addr, dram);
 	} else {
+		if (priv->substream_rec)
+			return -EBUSY;
 		priv->substream_rec = substream;
 		kirkwood_dma_conf_mbus_windows(priv->io,
 			KIRKWOOD_RECORD_WIN, addr, dram);
Signature · 1 line
2.1.4