summaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2015-07-21 18:32:58 +0200
committerMark Brown <broonie@kernel.org>2015-07-21 18:07:01 +0100
commitc4a42915d84ad4b5b5e13aeed5da67f458e22399 (patch)
treee4fa270b3ca573f4d056c5edb228c94b618fdd96 /sound/soc/kirkwood
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff)
downloadlinux-stable-c4a42915d84ad4b5b5e13aeed5da67f458e22399.tar.gz
linux-stable-c4a42915d84ad4b5b5e13aeed5da67f458e22399.tar.bz2
linux-stable-c4a42915d84ad4b5b5e13aeed5da67f458e22399.zip
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(). Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index 4cf2245950d7..dbfdfe99c69d 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -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);