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

Commit 1b063c3d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/fix/hda' into topic/hda

parents d301fc32 c1e99bd9

sound/pci/hda/hda_codec.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { 
	{ 0x14f1, "Conexant" },

	{ 0x17e8, "Chrontel" },

	{ 0x1854, "LG" },

	{ 0x1aec, "Wolfson Microelectronics" },

	{ 0x434d, "C-Media" },

	{ 0x8384, "SigmaTel" },

	{} /* terminator */

sound/pci/hda/patch_analog.c

+1 −0
Original line number Diff line number Diff line
@@ -3858,6 +3858,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = { 


static struct snd_pci_quirk ad1884a_cfg_tbl[] = {

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

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

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

	{}

};

sound/pci/hda/patch_sigmatel.c

+1 −3
Original line number Diff line number Diff line
@@ -583,10 +583,8 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol, 
			nid = codec->slave_dig_outs[smux_idx - 1];

		if (spec->cur_smux[smux_idx] == smux->num_items - 1)

			val = AMP_OUT_MUTE;

		if (smux_idx == 0)

			nid = spec->multiout.dig_out_nid;

		else

			nid = codec->slave_dig_outs[smux_idx - 1];

			val = AMP_OUT_UNMUTE;

		/* un/mute SPDIF out */

		snd_hda_codec_write_cache(codec, nid, 0,

			AC_VERB_SET_AMP_GAIN_MUTE, val);