diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-01-08 17:42:22 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-01-09 09:14:15 +0100 |
| commit | 2a2a5dddece676acbe3775e5ca9961f325717022 (patch) | |
| tree | c5f15278d3c5c0ff67b483f7de34a5f01e3d1d19 /sound/usb | |
| parent | 7fbe3ca571e4b0795b729658e3d76824be54cb18 (diff) | |
| download | linux-2a2a5dddece676acbe3775e5ca9961f325717022.tar.bz2 | |
[ALSA] usbaudio - Fix kobject_add() error at reconnection
Fixed the error from kobject_add() at reconnection the usb audio device.
This happens when an app keeps opening a device while the device is
replugged, due to the confliction of the internal bookkept index and
the really empty slot.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
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 5f160eebd15c..19bdcc74c96c 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -3286,6 +3286,7 @@ static void snd_usb_audio_create_proc(struct snd_usb_audio *chip) static int snd_usb_audio_free(struct snd_usb_audio *chip) { + usb_chip[chip->index] = NULL; kfree(chip); return 0; } @@ -3547,7 +3548,6 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr) list_for_each(p, &chip->mixer_list) { snd_usb_mixer_disconnect(p); } - usb_chip[chip->index] = NULL; mutex_unlock(®ister_mutex); snd_card_free_when_closed(card); } else { |