mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
Merge branch 'fix/hda' into topic/hda
This commit is contained in:
commit
db9c6f842f
2 changed files with 9 additions and 1 deletions
|
@ -2498,6 +2498,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
|
||||||
SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
|
||||||
SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
|
||||||
SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
|
||||||
|
SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS 1101HA", POS_FIX_LPIB),
|
||||||
SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
|
||||||
SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
|
||||||
SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
|
SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
|
||||||
|
@ -2993,7 +2994,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
|
||||||
/* SCH */
|
/* SCH */
|
||||||
{ PCI_DEVICE(0x8086, 0x811b),
|
{ PCI_DEVICE(0x8086, 0x811b),
|
||||||
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |
|
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |
|
||||||
AZX_DCAPS_BUFSIZE},
|
AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Poulsbo */
|
||||||
|
/* ICH */
|
||||||
{ PCI_DEVICE(0x8086, 0x2668),
|
{ PCI_DEVICE(0x8086, 0x2668),
|
||||||
.driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
|
.driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |
|
||||||
AZX_DCAPS_BUFSIZE }, /* ICH6 */
|
AZX_DCAPS_BUFSIZE }, /* ICH6 */
|
||||||
|
|
|
@ -4925,6 +4925,12 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
|
||||||
set_hp_led_gpio(codec);
|
set_hp_led_gpio(codec);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
/* BIOS bug: unfilled OEM string */
|
||||||
|
if (strstr(dev->name, "HP_Mute_LED_P_G")) {
|
||||||
|
set_hp_led_gpio(codec);
|
||||||
|
spec->gpio_led_polarity = 1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue