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

Commit c7857869 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents b5025c50 ff848471

sound/pci/hda/patch_analog.c

+1 −0
Original line number Diff line number Diff line
@@ -3978,6 +3978,7 @@ static struct snd_pci_quirk ad1884a_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),

	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),

	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE),

	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30d0, "HP laptop", AD1884A_LAPTOP),

	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP),

	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),

sound/pci/hda/patch_ca0110.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int ca0110_parse_auto_config(struct hda_codec *codec) 
}





int patch_ca0110(struct hda_codec *codec)

static int patch_ca0110(struct hda_codec *codec)

{

	struct ca0110_spec *spec;

	int err;