[alsa-devel] [PATCH] ALSA: hda - make sure alc268 does not OOPS on codec parse

[Takashi Iwai]

At Wed, 18 Jul 2012 18:02:53 +0200,
David Henningsson wrote:
> 
> A recent commit made patch_alc268 call snd_hda_pick_fixup with
> NULL quirk pointer. Make sure we do not reference that NULL pointer.
> 
> Signed-off-by: David Henningsson <david.henningsson at canonical.com>

Thanks, applied.


Takashi

> ---
>  sound/pci/hda/hda_auto_parser.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
> index f7520b9..647218d 100644
> --- a/sound/pci/hda/hda_auto_parser.c
> +++ b/sound/pci/hda/hda_auto_parser.c
> @@ -727,7 +727,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
>  			models++;
>  		}
>  	}
> -	if (id < 0) {
> +	if (id < 0 && quirk) {
>  		q = snd_pci_quirk_lookup(codec->bus->pci, quirk);
>  		if (q) {
>  			id = q->value;
> @@ -736,7 +736,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
>  #endif
>  		}
>  	}
> -	if (id < 0) {
> +	if (id < 0 && quirk) {
>  		for (q = quirk; q->subvendor; q++) {
>  			unsigned int vendorid =
>  				q->subdevice | (q->subvendor << 16);
> -- 
> 1.7.9.5
>