Applied "ASoC: stm32: Use snd_pcm_stop_xrun() helper" to the asoc tree

Message ID E1faiyq-00040h-Qo@debutante
State Accepted
Commit b1625fbb3b87affbedf14545b65d69ff182a0611
Headers show
  • Applied "ASoC: stm32: Use snd_pcm_stop_xrun() helper" to the asoc tree
Related show

Commit Message

Mark Brown July 4, 2018, 2:42 p.m.
The patch

   ASoC: stm32: Use snd_pcm_stop_xrun() helper

has been applied to the asoc tree at 

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.


From b1625fbb3b87affbedf14545b65d69ff182a0611 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <>

Date: Wed, 4 Jul 2018 16:01:46 +0200
Subject: [PATCH] ASoC: stm32: Use snd_pcm_stop_xrun() helper

The XRUN trigger from the driver should be done via
snd_pcm_stop_xrun().  It simplifies the locking as well.

Signed-off-by: Takashi Iwai <>

Signed-off-by: Mark Brown <>

 sound/soc/stm/stm32_sai_sub.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index c4f15ea14197..06fba9650ac4 100644
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -300,11 +300,8 @@  static irqreturn_t stm32_sai_isr(int irq, void *devid)
-	if (status != SNDRV_PCM_STATE_RUNNING) {
-		snd_pcm_stream_lock(sai->substream);
-		snd_pcm_stop(sai->substream, SNDRV_PCM_STATE_XRUN);
-		snd_pcm_stream_unlock(sai->substream);
-	}
+	if (status != SNDRV_PCM_STATE_RUNNING)
+		snd_pcm_stop_xrun(sai->substream);
 	return IRQ_HANDLED;