diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-15 06:21:20 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-15 06:22:20 -0400 |
commit | 1387cde51d0946eb3d8091b63f025c40cc1acdf4 (patch) | |
tree | 6102c8b578d08bcfced01bd3951e233407d0c9d9 /sound/pci | |
parent | 22ce5f74a954d02e56352ecfa45f8d7c817693e7 (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.c | 12 |
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) | |||
4081 | if (!spec) | 4081 | if (!spec) |
4082 | return -ENOMEM; | 4082 | return -ENOMEM; |
4083 | codec->spec = spec; | 4083 | codec->spec = spec; |
4084 | codec->pin_amp_workaround = 1; | ||
4084 | err = cx_auto_search_adcs(codec); | 4085 | err = cx_auto_search_adcs(codec); |
4085 | if (err < 0) | 4086 | if (err < 0) |
4086 | return err; | 4087 | return err; |
4087 | switch (codec->vendor_id) { | ||
4088 | case 0x14f15051: | ||
4089 | codec->pin_amp_workaround = 1; | ||
4090 | break; | ||
4091 | case 0x14f15045: | ||
4092 | codec->pin_amp_workaround = 1; | ||
4093 | break; | ||
4094 | case 0x14f15047: | ||
4095 | codec->pin_amp_workaround = 1; | ||
4096 | break; | ||
4097 | } | ||
4098 | err = cx_auto_parse_auto_config(codec); | 4088 | err = cx_auto_parse_auto_config(codec); |
4099 | if (err < 0) { | 4089 | if (err < 0) { |
4100 | kfree(codec->spec); | 4090 | kfree(codec->spec); |