ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Don't avoid stopping the stream at disconnection

Browse Source 
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: dc5eafe778 ("ALSA: usb-audio: Support PCM sync_stop")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210206203052.15606-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2021-02-06 21:30:52 +01:00
parent 5c2b301476
commit 257d2d7e9e
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/usb/endpoint.c
View File

@@ -890,9 +890,6 @@ static int stop_urbs(struct snd_usb_endpoint *ep, bool force)
{ {
unsigned int i; unsigned int i;
if (!force && atomic_read(&ep->chip->shutdown)) /* to be sure... */
return -EBADFD;
if (!force && atomic_read(&ep->running)) if (!force && atomic_read(&ep->running))
return -EBUSY; return -EBUSY;

5
sound/usb/pcm.c
View File

@@ -270,10 +270,7 @@ static int snd_usb_pcm_sync_stop(struct snd_pcm_substream *substream)
{ {
struct snd_usb_substream *subs = substream->runtime->private_data; struct snd_usb_substream *subs = substream->runtime->private_data;
if (!snd_usb_lock_shutdown(subs->stream->chip)) { sync_pending_stops(subs);
sync_pending_stops(subs);
snd_usb_unlock_shutdown(subs->stream->chip);
}
return 0; return 0;
} }