tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://github.com/tiwai/sound

* 'for-linus' of git://github.com/tiwai/sound:
ALSA: HDA: Add support for IDT 92HD93
ALSA: hda/realtek - Fix auto-mute with HP+LO configuration

Linus Torvalds 0ad79ed3 9d037a77

+6 -4
+5 -4
sound/pci/hda/patch_realtek.c
··· 168 168 unsigned int auto_mic_valid_imux:1; /* valid imux for auto-mic */ 169 169 unsigned int automute:1; /* HP automute enabled */ 170 170 unsigned int detect_line:1; /* Line-out detection enabled */ 171 - unsigned int automute_lines:1; /* automute line-out as well */ 171 + unsigned int automute_lines:1; /* automute line-out as well; NOP when automute_hp_lo isn't set */ 172 172 unsigned int automute_hp_lo:1; /* both HP and LO available */ 173 173 174 174 /* other flags */ ··· 551 551 if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0] || 552 552 spec->autocfg.line_out_pins[0] == spec->autocfg.speaker_pins[0]) 553 553 return; 554 - if (!spec->automute_lines || !spec->automute) 554 + if (!spec->automute || (spec->automute_hp_lo && !spec->automute_lines)) 555 555 on = 0; 556 556 else 557 557 on = spec->jack_present; ··· 803 803 unsigned int val; 804 804 if (!spec->automute) 805 805 val = 0; 806 - else if (!spec->automute_lines) 806 + else if (!spec->automute_hp_lo || !spec->automute_lines) 807 807 val = 1; 808 808 else 809 809 val = 2; ··· 824 824 spec->automute = 0; 825 825 break; 826 826 case 1: 827 - if (spec->automute && !spec->automute_lines) 827 + if (spec->automute && 828 + (!spec->automute_hp_lo || !spec->automute_lines)) 828 829 return 0; 829 830 spec->automute = 1; 830 831 spec->automute_lines = 0;
+1
sound/pci/hda/patch_sigmatel.c
··· 6573 6573 { .id = 0x111d76cc, .name = "92HD89F3", .patch = patch_stac92hd73xx }, 6574 6574 { .id = 0x111d76cd, .name = "92HD89F2", .patch = patch_stac92hd73xx }, 6575 6575 { .id = 0x111d76ce, .name = "92HD89F1", .patch = patch_stac92hd73xx }, 6576 + { .id = 0x111d76df, .name = "92HD93BXX", .patch = patch_stac92hd83xxx}, 6576 6577 { .id = 0x111d76e0, .name = "92HD91BXX", .patch = patch_stac92hd83xxx}, 6577 6578 { .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx}, 6578 6579 { .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx},