diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-02-06 21:36:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-02-08 16:00:28 +0100 |
| commit | 29bb274e94974669acb5186a75538f20df1508b6 (patch) | |
| tree | c7a38182f4688ff066763c2b545882d8dac43069 /sound/core/pcm.c | |
| parent | ALSA: usb-audio: Don't avoid stopping the stream at disconnection (diff) | |
| download | linux-dev-29bb274e94974669acb5186a75538f20df1508b6.tar.xz linux-dev-29bb274e94974669acb5186a75538f20df1508b6.zip | |
ALSA: pcm: Call sync_stop at disconnection
The PCM core should perform the sync for the pending stop operations
at disconnection. Otherwise it may lead to unexpected access.
Currently the old user of sync_stop, USB-audio driver, has its own
sync, so this isn't needed, but it's better to guarantee the sync in
the PCM core level.
This patch adds the missing sync_stop call at PCM disconnection
callback. It also assures the IRQ sync if it's specified in the
card. snd_pcm_sync_stop() is slightly modified to be called also for
any PCM substream object now.
Fixes: 1e850beea278 ("ALSA: pcm: Add the support for sync-stop operation")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210206203656.15959-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index e5947281e5fc..50eb29fcdfe7 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -1111,6 +1111,10 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) } } + for (cidx = 0; cidx < 2; cidx++) + for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) + snd_pcm_sync_stop(substream, false); + pcm_call_notify(pcm, n_disconnect); for (cidx = 0; cidx < 2; cidx++) { snd_unregister_device(&pcm->streams[cidx].dev); |