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

Commit db233669 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Only a few small HD-audio fixes:
   - Addition of new Conexant codec IDs
   - Two one-liners to add fixups for Realtek codecs
   - A last-minute regression fix for auto-mute with power-saving mode
     (regressed since 3.8-rc1)"

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix inconsistent pin states after resume
  ALSA: hda - Add Conexant CX20755/20756/20757 codec IDs
  ALSA: hda - Add fixup for Acer AO725 laptop
  ALSA: hda - Fix mute led for another HP machine
parents 6d26b3a1 31614bb8

sound/pci/hda/hda_codec.c

+2 −3
Original line number Diff line number Diff line
@@ -3654,6 +3654,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) 
	hda_set_power_state(codec, AC_PWRST_D0);

	restore_shutup_pins(codec);

	hda_exec_init_verbs(codec);

	snd_hda_jack_set_dirty_all(codec);

	if (codec->patch_ops.resume)

		codec->patch_ops.resume(codec);

	else {
@@ -3665,10 +3666,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) 


	if (codec->jackpoll_interval)

		hda_jackpoll_work(&codec->jackpoll_work.work);

	else {

		snd_hda_jack_set_dirty_all(codec);

	else

		snd_hda_jack_report_sync(codec);

	}



	codec->in_pm = 0;

	snd_hda_power_down(codec); /* flag down before returning */

sound/pci/hda/patch_conexant.c

+9 −0
Original line number Diff line number Diff line
@@ -4636,6 +4636,12 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { 
	  .patch = patch_conexant_auto },

	{ .id = 0x14f15111, .name = "CX20753/4",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f15113, .name = "CX20755",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f15114, .name = "CX20756",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f15115, .name = "CX20757",

	  .patch = patch_conexant_auto },

	{} /* terminator */

};
@@ -4659,6 +4665,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150b9"); 
MODULE_ALIAS("snd-hda-codec-id:14f1510f");

MODULE_ALIAS("snd-hda-codec-id:14f15110");

MODULE_ALIAS("snd-hda-codec-id:14f15111");

MODULE_ALIAS("snd-hda-codec-id:14f15113");

MODULE_ALIAS("snd-hda-codec-id:14f15114");

MODULE_ALIAS("snd-hda-codec-id:14f15115");



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Conexant HD-audio codec");

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -6251,6 +6251,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_MIC2_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x1972, "HP Pavilion 17", ALC269_FIXUP_MIC1_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x1977, "HP Pavilion 14", ALC269_FIXUP_MIC1_MUTE_LED),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
@@ -6265,6 +6266,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),

	SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),

	SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),

	SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK),

	SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),

	SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),

	SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),