From 5281a9e8563bfaf743612129c14c8d6562fcfa54 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 13 Nov 2012 11:22:48 +0100
Subject: [PATCH] --- yaml --- r: 335645 b: refs/heads/master c:
 10e44239f67d0b6fb74006e61a7e883b8075247a h: refs/heads/master i:   335643:
 4cbb7b28b5f5eddf41b6be38edd4dabc6f26bf14 v: v3

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

diff --git a/[refs] b/[refs]
index e6ff30a7daa9..9e77ca45ab96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: effded75e24c7941961d473e4f4babed4c52af3c
+refs/heads/master: 10e44239f67d0b6fb74006e61a7e883b8075247a
diff --git a/trunk/sound/usb/card.c b/trunk/sound/usb/card.c
index 282f0fc9fed1..dbf7999d18b4 100644
--- a/trunk/sound/usb/card.c
+++ b/trunk/sound/usb/card.c
@@ -559,9 +559,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
 		return;
 
 	card = chip->card;
-	mutex_lock(&register_mutex);
 	down_write(&chip->shutdown_rwsem);
 	chip->shutdown = 1;
+	up_write(&chip->shutdown_rwsem);
+
+	mutex_lock(&register_mutex);
 	chip->num_interfaces--;
 	if (chip->num_interfaces <= 0) {
 		snd_card_disconnect(card);
@@ -582,11 +584,9 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
 			snd_usb_mixer_disconnect(p);
 		}
 		usb_chip[chip->index] = NULL;
-		up_write(&chip->shutdown_rwsem);
 		mutex_unlock(&register_mutex);
 		snd_card_free_when_closed(card);
 	} else {
-		up_write(&chip->shutdown_rwsem);
 		mutex_unlock(&register_mutex);
 	}
 }