mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
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: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
f0913cd16e
commit
639aa4bd58
1 changed files with 2 additions and 2 deletions
|
@ -727,7 +727,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
|
||||||
models++;
|
models++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (id < 0) {
|
if (id < 0 && quirk) {
|
||||||
q = snd_pci_quirk_lookup(codec->bus->pci, quirk);
|
q = snd_pci_quirk_lookup(codec->bus->pci, quirk);
|
||||||
if (q) {
|
if (q) {
|
||||||
id = q->value;
|
id = q->value;
|
||||||
|
@ -736,7 +736,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (id < 0) {
|
if (id < 0 && quirk) {
|
||||||
for (q = quirk; q->subvendor; q++) {
|
for (q = quirk; q->subvendor; q++) {
|
||||||
unsigned int vendorid =
|
unsigned int vendorid =
|
||||||
q->subdevice | (q->subvendor << 16);
|
q->subdevice | (q->subvendor << 16);
|
||||||
|
|
Loading…
Reference in a new issue