diff options
author | Karsten Wiese <annabellesgarden@yahoo.de> | 2005-06-14 09:54:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 11:05:13 -0700 |
commit | efa93dbedd0e2eacf49ea6fff1fe4397d520cf61 (patch) | |
tree | 2fc2f2f52d2509bb73d6aa847c4fc8a8a188e0bc /sound/usb | |
parent | 9a47696970bc8233818d370011e2fddae5cfce9f (diff) | |
download | op-kernel-dev-efa93dbedd0e2eacf49ea6fff1fe4397d520cf61.zip op-kernel-dev-efa93dbedd0e2eacf49ea6fff1fe4397d520cf61.tar.gz |
[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used
Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's. This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed. The patch ensures the correct sequence. Tested ok on
kernel 2.6.12-rc2.
Present in ALSA cvs
Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 84b0bbd..aae6614 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -3289,7 +3289,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr) } usb_chip[chip->index] = NULL; up(®ister_mutex); - snd_card_free_in_thread(card); + snd_card_free(card); } else { up(®ister_mutex); } |