mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
Merge branch 'fix/hda' into topic/hda
This commit is contained in:
commit
20d157aef2
6 changed files with 13 additions and 13 deletions
|
@ -2277,6 +2277,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
|
|||
SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
|
||||
SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
|
||||
SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
|
||||
SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
|
||||
SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -527,14 +527,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
|
|||
ad198x_power_eapd(codec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad198x_resume(struct hda_codec *codec)
|
||||
{
|
||||
ad198x_init(codec);
|
||||
snd_hda_codec_resume_amp(codec);
|
||||
snd_hda_codec_resume_cache(codec);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct hda_codec_ops ad198x_patch_ops = {
|
||||
|
@ -547,7 +539,6 @@ static struct hda_codec_ops ad198x_patch_ops = {
|
|||
#endif
|
||||
#ifdef SND_HDA_NEEDS_RESUME
|
||||
.suspend = ad198x_suspend,
|
||||
.resume = ad198x_resume,
|
||||
#endif
|
||||
.reboot_notify = ad198x_shutup,
|
||||
};
|
||||
|
|
|
@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec)
|
|||
for (n = 0; n < AUTO_PIN_LAST; n++) {
|
||||
if (!spec->adc_nid[n])
|
||||
continue;
|
||||
err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]);
|
||||
err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -1196,9 +1196,10 @@ static int patch_cxt5045(struct hda_codec *codec)
|
|||
|
||||
switch (codec->subsystem_id >> 16) {
|
||||
case 0x103c:
|
||||
case 0x1631:
|
||||
case 0x1734:
|
||||
/* HP & Fujitsu-Siemens laptops have really bad sound over 0dB
|
||||
* on NID 0x17. Fix max PCM level to 0 dB
|
||||
/* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad
|
||||
* sound over 0dB on NID 0x17. Fix max PCM level to 0 dB
|
||||
* (originally it has 0x2b steps with 0dB offset 0x14)
|
||||
*/
|
||||
snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
|
||||
|
@ -2967,6 +2968,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
|
|||
CXT5066_DELL_LAPTOP),
|
||||
SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
|
||||
SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
|
||||
SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
|
||||
SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
|
||||
SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
|
||||
SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
|
||||
SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
|
||||
{}
|
||||
|
|
|
@ -4231,7 +4231,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
|
|||
SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
|
||||
SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),
|
||||
SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU),
|
||||
SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL),
|
||||
SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734),
|
||||
SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),
|
||||
SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
|
||||
SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
|
||||
|
|
|
@ -1607,6 +1607,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
|
|||
"Dell Studio 1555", STAC_DELL_M6_DMIC),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,
|
||||
"Dell Studio 1557", STAC_DELL_M6_DMIC),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
|
||||
"Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
|
||||
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,
|
||||
"Dell Studio 1558", STAC_DELL_M6_BOTH),
|
||||
{} /* terminator */
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue