From: Thomas Pfaff <tpfaff@gmx.net>
Date: Mon, 26 Sep 2011 13:43:59 +0000 (+0200)
Subject: ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
X-Git-Tag: v3.0.5~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=81aac2ec5c236e54389d8940da0d318dd23e06ee;p=karo-tx-linux.git

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>
---

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 29b309474add..57a8e2d0139f 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -529,9 +529,11 @@ static void *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;