aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-06-20 09:44:00 -0400
committerDave Kleikamp <shaggy@austin.ibm.com>2005-06-20 09:44:00 -0400
commitd039ba24f135147f60a13bcaa768189a5b773b6e (patch)
tree444b7596ab8312b5954d15c3135052a7c09c6fbe /sound/usb/usbaudio.c
parent72e3148a6e987974e3e949c5668e5ca812d7c818 (diff)
parent8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff)
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'sound/usb/usbaudio.c')
-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 84b0bbddbd22..aae66144d411 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)
3289 } 3289 }
3290 usb_chip[chip->index] = NULL; 3290 usb_chip[chip->index] = NULL;
3291 up(&register_mutex); 3291 up(&register_mutex);
3292 snd_card_free_in_thread(card); 3292 snd_card_free(card);
3293 } else { 3293 } else {
3294 up(&register_mutex); 3294 up(&register_mutex);
3295 } 3295 }