Permalink
Browse files

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>
  • Loading branch information...
1 parent abdd8c6 commit 81aac2ec5c236e54389d8940da0d318dd23e06ee Thomas Pfaff committed with gregkh Sep 26, 2011
Showing with 5 additions and 3 deletions.
  1. +5 −3 sound/usb/card.c
View
@@ -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;

0 comments on commit 81aac2e

Please sign in to comment.