diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-10-12 17:12:55 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-10-30 14:06:54 +0400 |
commit | 978520b75f0a1ce82b17e1e8186417250de6d545 (patch) | |
tree | 2b0d8619df66706779d9520789e27bf6ca385383 /sound/usb/stream.c | |
parent | 9b0573c07f278e9888c352aa9724035c75784ea0 (diff) | |
download | linux-978520b75f0a1ce82b17e1e8186417250de6d545.tar.xz |
ALSA: usb-audio: Fix races at disconnection
Close some races at disconnection of a USB audio device by adding the
chip->shutdown_mutex and chip->shutdown check at appropriate places.
The spots to put bandaids are:
- PCM prepare, hw_params and hw_free
- where the usb device is accessed for communication or get speed, in
mixer.c and others; the device speed is now cached in subs->speed
instead of accessing to chip->dev
The accesses in PCM open and close don't need the mutex protection
because these are already handled in the core PCM disconnection code.
The autosuspend/autoresume codes are still uncovered by this patch
because of possible mutex deadlocks. They'll be covered by the
upcoming change to rwsem.
Also the mixer codes are untouched, too. These will be fixed in
another patch, too.
Reported-by: Matthieu CASTET <matthieu.castet@parrot.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/stream.c')
-rw-r--r-- | sound/usb/stream.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 083ed81160e5..1de0c8c002a8 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -90,6 +90,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, subs->direction = stream; subs->dev = as->chip->dev; subs->txfr_quirk = as->chip->txfr_quirk; + subs->speed = snd_usb_get_speed(subs->dev); snd_usb_set_pcm_ops(as->pcm, stream); |