Skip to content

L
linux-davinci
Commit 69b5de84 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/hda' into for-linus

parents bfe70783 8f0f5ff6
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
sound/pci/hda/patch_cirrus.c
View file @ 69b5de84
...@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec) ...@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec)
for (n = 0; n < AUTO_PIN_LAST; n++) { for (n = 0; n < AUTO_PIN_LAST; n++) {
if (!spec->adc_nid[n]) if (!spec->adc_nid[n])
continue; 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) if (err < 0)
return err; return err;
} }
......
sound/pci/hda/patch_conexant.c
View file @ 69b5de84
...@@ -1195,9 +1195,10 @@ static int patch_cxt5045(struct hda_codec *codec) ...@@ -1195,9 +1195,10 @@ static int patch_cxt5045(struct hda_codec *codec)
switch (codec->subsystem_id >> 16) { switch (codec->subsystem_id >> 16) {
case 0x103c: case 0x103c:
case 0x1631:
case 0x1734: case 0x1734:
/* HP & Fujitsu-Siemens laptops have really bad sound over 0dB /* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad
* on NID 0x17. Fix max PCM level to 0 dB * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB
* (originally it has 0x2b steps with 0dB offset 0x14) * (originally it has 0x2b steps with 0dB offset 0x14)
*/ */
snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
...@@ -2842,6 +2843,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { ...@@ -2842,6 +2843,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
CXT5066_DELL_LAPTOP), CXT5066_DELL_LAPTOP),
SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), 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, 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, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
{} {}
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment