From 439de7e64f1d6c24694697ca103185dbd04563f0 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Thu, 28 Apr 2005 09:26:48 +0200 Subject: [PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used Summary: 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright --- sound/usb/usbaudio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index e7520f99054c..5ea025155db9 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -3276,7 +3276,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); } -- cgit v1.2.3