diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 23:06:48 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 23:06:48 +0200 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /sound/usb/usbaudio.c | |
| parent | Merge with temp tree to get David's gdb inferior calls patch (diff) | |
| parent | [PATCH] update ppc64 defconfig (diff) | |
| download | linux-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz linux-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'sound/usb/usbaudio.c')
| -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 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) } usb_chip[chip->index] = NULL; up(®ister_mutex); - snd_card_free_in_thread(card); + snd_card_free(card); } else { up(®ister_mutex); } |