From 81aac2ec5c236e54389d8940da0d318dd23e06ee Mon Sep 17 00:00:00 2001 From: Thomas Pfaff Date: Mon, 26 Sep 2011 15:43:59 +0200 Subject: 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 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/card.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sound/usb') diff --git a/sound/usb/card.c b/sound/usb/card.c index 29b309474ad..57a8e2d0139 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(®ister_mutex); __err_val: return NULL; -- cgit v1.2.3-18-g5258