lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
Cc: <stable@kernel.org> [2.6.39+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Thomas Pfaff
2011-09-26 15:43:59 +02:00
committed by Takashi Iwai
parent e0d32e335f
commit 61a6a108d1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/usb/card.c
View File

@@ -530,9 +530,11 @@ snd_usb_audio_probe(struct usb_device *dev,
return chip; return chip;
__error: __error:
if (chip && !chip->num_interfaces) if (chip) {
snd_card_free(chip->card); if (!chip->num_interfaces)
chip->probing = 0; snd_card_free(chip->card);
chip->probing = 0;
}
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
__err_val: __err_val:
return NULL; return NULL;