From 9eb70e68f38bbc5996a2193e7b7dc0b5487a08cb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Apr 2008 12:53:26 +0200 Subject: [ALSA] usb-audio - Fix race in reconnection Fix the race at reconnection of the device. The disconnected usb_chip[] must be cleared before the next probe call properly. Signed-off-by: Takashi Iwai --- sound/usb/usbaudio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound') diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 7b3bcf1916d2..410be4aff1ba 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -3424,7 +3424,6 @@ 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; } @@ -3689,6 +3688,7 @@ 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 { -- cgit v1.2.3