From 016278bc3112f856d61a2e942183add9615417fd Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 17 Apr 2008 12:53:26 +0200
Subject: [PATCH] --- yaml --- r: 92230 b: refs/heads/master c:
 9eb70e68f38bbc5996a2193e7b7dc0b5487a08cb h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/usbaudio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 491f507e7a14..62233b698024 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f18638dcf0c481eca2430206ebcdc7295aec8623
+refs/heads/master: 9eb70e68f38bbc5996a2193e7b7dc0b5487a08cb
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index 7b3bcf1916d2..410be4aff1ba 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/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(&register_mutex);
 		snd_card_free_when_closed(card);
 	} else {