commit 61a6a108d15213f5ee06332e1e7766d3860e4453
author Thomas Pfaff <tpfaff@gmx.net> Mon Sep 26 15:43:59 2011 +0200
committer Takashi Iwai <tiwai@suse.de> Mon Sep 26 15:48:47 2011 +0200
tree 6ffc2d8dbe6d7c80109f3e316e7a11da0e4c926b
parent e0d32e335fc0e354db93a807736243f5035fbc67

ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag

Before clearing the probing flag in the error exit path, check that the
chip pointer is not NULL.

Signed-off-by: Thomas Pfaff <tpfaff@gmx.net>
Cc: <stable@kernel.org> [2.6.39+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/usb/card.c

diff --git a/sound/usb/card.c b/sound/usb/card.c
index ed120ca..d8f2bf4 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -530,9 +530,11 @@
 	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;