Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+13
-3
+2
-3
sound/pci/hda/hda_codec.c
+2
-3
sound/pci/hda/hda_codec.c
···
3654
3654
hda_set_power_state(codec, AC_PWRST_D0);
3655
3655
restore_shutup_pins(codec);
3656
3656
hda_exec_init_verbs(codec);
3657
+
snd_hda_jack_set_dirty_all(codec);
3657
3658
if (codec->patch_ops.resume)
3658
3659
codec->patch_ops.resume(codec);
3659
3660
else {
···
3666
3665
3667
3666
if (codec->jackpoll_interval)
3668
3667
hda_jackpoll_work(&codec->jackpoll_work.work);
3669
-
else {
3670
-
snd_hda_jack_set_dirty_all(codec);
3668
+
else
3671
3669
snd_hda_jack_report_sync(codec);
3672
-
}
3673
3670
3674
3671
codec->in_pm = 0;
3675
3672
snd_hda_power_down(codec); /* flag down before returning */
+9
sound/pci/hda/patch_conexant.c
+9
sound/pci/hda/patch_conexant.c
···
4636
4636
.patch = patch_conexant_auto },
4637
4637
{ .id = 0x14f15111, .name = "CX20753/4",
4638
4638
.patch = patch_conexant_auto },
4639
+
{ .id = 0x14f15113, .name = "CX20755",
4640
+
.patch = patch_conexant_auto },
4641
+
{ .id = 0x14f15114, .name = "CX20756",
4642
+
.patch = patch_conexant_auto },
4643
+
{ .id = 0x14f15115, .name = "CX20757",
4644
+
.patch = patch_conexant_auto },
4639
4645
{} /* terminator */
4640
4646
};
4641
4647
···
4665
4659
MODULE_ALIAS("snd-hda-codec-id:14f1510f");
4666
4660
MODULE_ALIAS("snd-hda-codec-id:14f15110");
4667
4661
MODULE_ALIAS("snd-hda-codec-id:14f15111");
4662
+
MODULE_ALIAS("snd-hda-codec-id:14f15113");
4663
+
MODULE_ALIAS("snd-hda-codec-id:14f15114");
4664
+
MODULE_ALIAS("snd-hda-codec-id:14f15115");
4668
4665
4669
4666
MODULE_LICENSE("GPL");
4670
4667
MODULE_DESCRIPTION("Conexant HD-audio codec");
+2
sound/pci/hda/patch_realtek.c
+2
sound/pci/hda/patch_realtek.c
···
6251
6251
SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),
6252
6252
SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_MIC2_MUTE_LED),
6253
6253
SND_PCI_QUIRK(0x103c, 0x1972, "HP Pavilion 17", ALC269_FIXUP_MIC1_MUTE_LED),
6254
+
SND_PCI_QUIRK(0x103c, 0x1977, "HP Pavilion 14", ALC269_FIXUP_MIC1_MUTE_LED),
6254
6255
SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC),
6255
6256
SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC),
6256
6257
SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
···
6266
6265
SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
6267
6266
SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
6268
6267
SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
6268
+
SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK),
6269
6269
SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),
6270
6270
SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
6271
6271
SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),