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 <[email protected]>
Cc: <[email protected]> [2.6.39+]
Signed-off-by: Takashi Iwai <[email protected]>

diff --git a/sound/usb/card.c b/sound/usb/card.c
index ed120ca2353dd67f4d71efea6f330dda3354131f..d8f2bf4014589bec80c95af42a8c55bd08a87865 100644 (file)
--- a/sound/usb/card.c
+++ b/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;