]> err.no Git - linux-2.6/commitdiff
[ALSA] usb-audio - Fix race in reconnection
authorTakashi Iwai <tiwai@suse.de>
Thu, 17 Apr 2008 10:53:26 +0000 (12:53 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:39 +0000 (12:00 +0200)
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 <tiwai@suse.de>
sound/usb/usbaudio.c

index 7b3bcf1916d21238ba2122b5db04ce0a284a4907..410be4aff1baed739dac2d88fa178d58f640e993 100644 (file)
@@ -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(&register_mutex);
                snd_card_free_when_closed(card);
        } else {