summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-15 12:21:20 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-15 12:22:20 +0200
commit1387cde51d0946eb3d8091b63f025c40cc1acdf4 (patch)
tree6102c8b578d08bcfced01bd3951e233407d0c9d9 /sound/pci
parent22ce5f74a954d02e56352ecfa45f8d7c817693e7 (diff)
ALSA: hda - Enable codec->pin_amp_workaround always for Conexant auto-parser
It can (must for some) be used for all Conexnat codecs safely. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index ebce2fe3aec2..fb759bff91a9 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -4081,20 +4081,10 @@ static int patch_conexant_auto(struct hda_codec *codec)
if (!spec)
return -ENOMEM;
codec->spec = spec;
+ codec->pin_amp_workaround = 1;
err = cx_auto_search_adcs(codec);
if (err < 0)
return err;
- switch (codec->vendor_id) {
- case 0x14f15051:
- codec->pin_amp_workaround = 1;
- break;
- case 0x14f15045:
- codec->pin_amp_workaround = 1;
- break;
- case 0x14f15047:
- codec->pin_amp_workaround = 1;
- break;
- }
err = cx_auto_parse_auto_config(codec);
if (err < 0) {
kfree(codec->spec);