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

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

Merge branch 'fix/hda' into topic/hda 

Conflicts:
	sound/pci/hda/patch_realtek.c
parents bedfcebb bb543c96

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -10807,6 +10807,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = { 
			   ALC262_HP_BPC),

	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",

			   ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x170b, "HP xw*", ALC262_HP_BPC),

	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),

	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),

	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),

sound/pci/hda/patch_sigmatel.c

+1 −1
Original line number Diff line number Diff line
@@ -5066,7 +5066,7 @@ again: 
	case STAC_DELL_M4_3:

		spec->num_dmics = 1;

		spec->num_smuxes = 0;

		spec->num_dmuxes = 0;

		spec->num_dmuxes = 1;

		break;

	case STAC_HP_DV5:

		snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);