diff --git a/[refs] b/[refs]
index 927244a11947..536438e75c1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fbe3ca571e4b0795b729658e3d76824be54cb18
+refs/heads/master: 2a2a5dddece676acbe3775e5ca9961f325717022
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index 5f160eebd15c..19bdcc74c96c 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/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(&register_mutex);
 		snd_card_free_when_closed(card);
 	} else {