aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-28 12:24:22 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-28 12:24:22 +0100
commit78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d (patch)
tree6919af56842f47f2a2b553b890320a9952c501b6 /sound
parent9980c6209ebc2a02eb3ca51a4fae1e17f645c868 (diff)
downloadlinux-2.6.34-ux500-78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d.tar.gz
ALSA: usb-audio - Avoid Oops after disconnect
As the release of substreams may be done asynchronously from the disconnection, close callback needs to check the shutdown flag before actually accessing the usb interface. Reference: Novell bnc#505027 http://bugzilla.novell.com/show_bug.cgi?id=565027 Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/usbaudio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 4963defee18..9edef468497 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1936,7 +1936,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
struct snd_usb_substream *subs = &as->substream[direction];
- if (subs->interface >= 0) {
+ if (!as->chip->shutdown && subs->interface >= 0) {
usb_set_interface(subs->dev, subs->interface, 0);
subs->interface = -1;
}