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

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

Merge branch 'for-linus' into for-next

parents 0ab1ace8 6ef2f68f

sound/pci/hda/patch_conexant.c

+6 −1
Original line number Diff line number Diff line
@@ -204,8 +204,13 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) 
{

	struct conexant_spec *spec = codec->spec;



	if (codec->core.vendor_id != 0x14f150f2)

	switch (codec->core.vendor_id) {

	case 0x14f150f2: /* CX20722 */

	case 0x14f150f4: /* CX20724 */

		break;

	default:

		return;

	}



	/* Turn the CX20722 codec into D3 to avoid spurious noises

	   from the internal speaker during (and after) reboot */

sound/pci/hda/patch_hdmi.c

+4 −0
Original line number Diff line number Diff line
@@ -2208,6 +2208,10 @@ static void intel_pin_eld_notify(void *audio_ptr, int port) 
	struct hda_codec *codec = audio_ptr;

	int pin_nid = port + 0x04;



	/* we assume only from port-B to port-D */

	if (port < 1 || port > 3)

		return;



	/* skip notification during system suspend (but not in runtime PM);

	 * the state will be updated at resume

	 */

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -5556,6 +5556,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),

	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),