| Date | Wed, 28 Sep 2011 15:03:13 -0700 | From | Greg KH <> | Subject | [229/244] ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag |
| |
3.0-stable review patch. If anyone has any objections, please let us know.
------------------
From: Thomas Pfaff <tpfaff@gmx.net>
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>
--- sound/usb/card.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
--- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -529,9 +529,11 @@ static void *snd_usb_audio_probe(struct 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;
|