Merge branch 'fix/hda' into for-linus
This commit is contained in:
commit
1f10cd34d9
|
@ -2273,6 +2273,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),
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -519,14 +519,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 = {
|
||||
|
@ -539,7 +531,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,
|
||||
};
|
||||
|
|
|
@ -4143,7 +4143,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