Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 639aa4bd authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - make sure alc268 does not OOPS on codec parse 



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: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f0913cd1

sound/pci/hda/hda_auto_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -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);