This is a note to let you know that I've just added the patch titled ALSA: usb-audio: Don't avoid stopping the stream at disconnection to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: alsa-usb-audio-don-t-avoid-stopping-the-stream-at-disconnection.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 257d2d7e9e798305d65825cb82b0a7d1c0511e89 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@xxxxxxx> Date: Sat, 6 Feb 2021 21:30:52 +0100 Subject: ALSA: usb-audio: Don't avoid stopping the stream at disconnection From: Takashi Iwai <tiwai@xxxxxxx> commit 257d2d7e9e798305d65825cb82b0a7d1c0511e89 upstream. In the later patch, we're going to issue the PCM sync_stop calls at disconnection. But currently the USB-audio driver can't handle it because it has a check of shutdown flag for stopping the URBs. This is basically superfluous (the stopping URBs are safe at disconnection state), so let's drop the check. Fixes: dc5eafe7787c ("ALSA: usb-audio: Support PCM sync_stop") Cc: <stable@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20210206203052.15606-4-tiwai@xxxxxxx Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- sound/usb/endpoint.c | 3 --- sound/usb/pcm.c | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -890,9 +890,6 @@ static int stop_urbs(struct snd_usb_endp { unsigned int i; - if (!force && atomic_read(&ep->chip->shutdown)) /* to be sure... */ - return -EBADFD; - if (!force && atomic_read(&ep->running)) return -EBUSY; --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -270,10 +270,7 @@ static int snd_usb_pcm_sync_stop(struct { struct snd_usb_substream *subs = substream->runtime->private_data; - if (!snd_usb_lock_shutdown(subs->stream->chip)) { - sync_pending_stops(subs); - snd_usb_unlock_shutdown(subs->stream->chip); - } + sync_pending_stops(subs); return 0; } Patches currently in stable-queue which might be from tiwai@xxxxxxx are queue-5.11/alsa-usb-audio-correct-document-for-snd_usb_endpoint_free_all.patch queue-5.11/alsa-pcm-don-t-call-sync_stop-if-it-hasn-t-been-stopped.patch queue-5.11/alsa-usb-audio-fix-pcm-buffer-allocation-in-non-vmalloc-mode.patch queue-5.11/alsa-usb-audio-handle-invalid-running-state-at-releasing-ep.patch queue-5.11/alsa-usb-audio-more-strict-state-change-in-ep.patch queue-5.11/alsa-hda-add-another-cometlake-h-pci-id.patch queue-5.11/alsa-hda-realtek-quirk-for-hp-spectre-x360-14-amp-setup.patch queue-5.11/alsa-pcm-assure-sync-with-the-pending-stop-operation-at-suspend.patch queue-5.11/alsa-fireface-fix-to-parse-sync-status-register-of-latter-protocol.patch queue-5.11/alsa-hda-realtek-modify-eapd-in-the-alc886.patch queue-5.11/alsa-pcm-call-sync_stop-at-disconnection.patch queue-5.11/alsa-hda-hdmi-drop-bogus-check-at-closing-a-stream.patch queue-5.11/asoc-siu-fix-build-error-by-a-wrong-const-prefix.patch queue-5.11/alsa-usb-audio-don-t-avoid-stopping-the-stream-at-disconnection.patch queue-5.11/alsa-usb-audio-add-implicit-fb-quirk-for-boss-gp-10.patch