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

Commit 85255c0e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents f30c14b6 9ec8ddad

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2269,6 +2269,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),

sound/pci/hda/patch_realtek.c

+4 −1
Original line number Diff line number Diff line
@@ -10043,8 +10043,11 @@ static void alc882_auto_set_output_and_unmute(struct hda_codec *codec, 
	alc_set_pin_output(codec, nid, pin_type);

	if (spec->multiout.dac_nids[dac_idx] == 0x25)

		idx = 4;

	else

	else {

		if (spec->multiout.num_dacs >= dac_idx)

			return;

		idx = spec->multiout.dac_nids[dac_idx] - 2;

	}

	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, idx);















}