From f6617e605afadf01518baa3691b98da8477d24ef Mon Sep 17 00:00:00 2001
From: Thomas Pfaff <tpfaff@gmx.net>
Date: Mon, 26 Sep 2011 15:43:59 +0200
Subject: [PATCH] --- yaml --- r: 264142 b: refs/heads/master c:
 61a6a108d15213f5ee06332e1e7766d3860e4453 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f3f08a55dcd..5ba3fba98068 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0d32e335fc0e354db93a807736243f5035fbc67
+refs/heads/master: 61a6a108d15213f5ee06332e1e7766d3860e4453
diff --git a/trunk/sound/usb/card.c b/trunk/sound/usb/card.c
index ed120ca2353d..d8f2bf401458 100644
--- a/trunk/sound/usb/card.c
+++ b/trunk/sound/usb/card.c
@@ -530,9 +530,11 @@ snd_usb_audio_probe(struct usb_device *dev,
 	return chip;
 
  __error:
-	if (chip && !chip->num_interfaces)
-		snd_card_free(chip->card);
-	chip->probing = 0;
+	if (chip) {
+		if (!chip->num_interfaces)
+			snd_card_free(chip->card);
+		chip->probing = 0;
+	}
 	mutex_unlock(&register_mutex);
  __err_val:
 	return NULL;