diff options
author | Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> | 2012-04-06 09:34:19 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:25:47 -0400 |
commit | 51969d62c3b26e887dae734de421b320a296ac58 (patch) | |
tree | 8eaa5d9bbbe4345215597404534a4f07480fd3b4 /sound/pci | |
parent | e6e03daecd2c82437b550ad1a62052c22fdb2b5b (diff) |
ALSA: hda - CX20549 doesn't need pin_amp_workaround.
CX20549 (ctx5045) doesn't accept data on index 1 for output pins,
as shown in the following hda-var transaction:
$ hda-verb /dev/snd/hwC0D0 0x10 set_amp_gain 0xb126
nid = 0x10, verb = 0x300, param = 0xb126
value = 0x0
$ hda-verb /dev/snd/hwC0D0 0x10 get_amp_gain 0x8001
nid = 0x10, verb = 0xb00, param = 0x8001
value = 0x0
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 4b365488c58b..84337e63fadf 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -1086,7 +1086,6 @@ static int patch_cxt5045(struct hda_codec *codec) | |||
1086 | if (!spec) | 1086 | if (!spec) |
1087 | return -ENOMEM; | 1087 | return -ENOMEM; |
1088 | codec->spec = spec; | 1088 | codec->spec = spec; |
1089 | codec->pin_amp_workaround = 1; | ||
1090 | codec->single_adc_amp = 1; | 1089 | codec->single_adc_amp = 1; |
1091 | 1090 | ||
1092 | spec->multiout.max_channels = 2; | 1091 | spec->multiout.max_channels = 2; |
@@ -4443,7 +4442,6 @@ static int patch_conexant_auto(struct hda_codec *codec) | |||
4443 | if (!spec) | 4442 | if (!spec) |
4444 | return -ENOMEM; | 4443 | return -ENOMEM; |
4445 | codec->spec = spec; | 4444 | codec->spec = spec; |
4446 | codec->pin_amp_workaround = 1; | ||
4447 | 4445 | ||
4448 | switch (codec->vendor_id) { | 4446 | switch (codec->vendor_id) { |
4449 | case 0x14f15045: | 4447 | case 0x14f15045: |
@@ -4451,7 +4449,10 @@ static int patch_conexant_auto(struct hda_codec *codec) | |||
4451 | break; | 4449 | break; |
4452 | case 0x14f15051: | 4450 | case 0x14f15051: |
4453 | add_cx5051_fake_mutes(codec); | 4451 | add_cx5051_fake_mutes(codec); |
4452 | codec->pin_amp_workaround = 1; | ||
4454 | break; | 4453 | break; |
4454 | default: | ||
4455 | codec->pin_amp_workaround = 1; | ||
4455 | } | 4456 | } |
4456 | 4457 | ||
4457 | apply_pin_fixup(codec, cxt_fixups, cxt_pincfg_tbl); | 4458 | apply_pin_fixup(codec, cxt_fixups, cxt_pincfg_tbl); |