commit 81aac2ec5c236e54389d8940da0d318dd23e06ee
author Thomas Pfaff <tpfaff@gmx.net> Mon Sep 26 15:43:59 2011 +0200
committer Greg Kroah-Hartman <gregkh@suse.de> Mon Oct 03 11:41:08 2011 -0700
tree 40561608f9c0bac67801a6b1c0f8dd54a759713f
parent abdd8c6a58728c695a59f9d6b95d9b6b4d7ffbc8

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

commit 61a6a108d15213f5ee06332e1e7766d3860e4453 upstream.

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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

sound/usb/card.c

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 29b3094..57a8e2d 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -529,9 +529,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;