lkml.org 
[lkml]   [2011]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] usb-audio: Check for possible chip NULL pointer before clearing probing flag
At Mon, 26 Sep 2011 15:43:59 +0200 (CEST),
Thomas Pfaff wrote:
>
> 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>

Applied now. Thanks.


Takashi


> ---
> diff -urp a/sound/usb/card.c b/sound/usb/card.c
> --- a/sound/usb/card.c 2011-09-26 14:58:02.468672118 +0200
> +++ b/sound/usb/card.c 2011-09-26 15:00:30.313110086 +0200
> @@ -530,9 +530,11 @@ snd_usb_audio_probe(struct usb_device *d
> 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;
>


\
 
 \ /
  Last update: 2011-09-26 15:55    [W:0.047 / U:0.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site