diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-12-05 14:21:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-12-05 14:22:47 +0100 |
commit | 5c8cc93b06d1ff860327a273abf3ac006290d242 (patch) | |
tree | 35da30e5dde3afc3978fffe5bdf5a15d5aa34a75 /sound/core | |
parent | 7d721baea138696d5a6746fb5bce0a510a91bd65 (diff) | |
download | linux-stable-5c8cc93b06d1ff860327a273abf3ac006290d242.tar.gz linux-stable-5c8cc93b06d1ff860327a273abf3ac006290d242.tar.bz2 linux-stable-5c8cc93b06d1ff860327a273abf3ac006290d242.zip |
ALSA: pcm: Set missing stop_operating flag at undoing trigger start
When a PCM trigger-start fails at snd_pcm_do_start(), PCM core tries
to undo the action at snd_pcm_undo_start() by issuing the trigger STOP
manually. At that point, we forgot to set the stop_operating flag,
hence the sync-stop won't be issued at the next prepare or other
calls.
This patch adds the missing stop_operating flag at
snd_pcm_undo_start().
Fixes: 1e850beea278 ("ALSA: pcm: Add the support for sync-stop operation")
Link: https://lore.kernel.org/r/b4e71631-4a94-613-27b2-fb595792630@carlh.net
Link: https://lore.kernel.org/r/20221205132124.11585-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/pcm_native.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index ba6e44d02faa..e3deec62b9a1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1432,8 +1432,10 @@ static int snd_pcm_do_start(struct snd_pcm_substream *substream, static void snd_pcm_undo_start(struct snd_pcm_substream *substream, snd_pcm_state_t state) { - if (substream->runtime->trigger_master == substream) + if (substream->runtime->trigger_master == substream) { substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_STOP); + substream->runtime->stop_operating = true; + } } static void snd_pcm_post_start(struct snd_pcm_substream *substream, |