From 10a4394db429f293aa8dc6f7941e1ed8d63bad4b Mon Sep 17 00:00:00 2001 From: Michael Karcher Date: Fri, 6 Apr 2012 15:34:19 +0200 Subject: [PATCH] --- yaml --- r: 298939 b: refs/heads/master c: 51969d62c3b26e887dae734de421b320a296ac58 h: refs/heads/master i: 298937: 8d7999160846644243554c7a8c5f68f6c333fca8 298935: 27684fd81d5852d1ba4a0950577dae18da90c26b v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_conexant.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6bc9fbd0e439..5e5de6a7d62f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6e03daecd2c82437b550ad1a62052c22fdb2b5b +refs/heads/master: 51969d62c3b26e887dae734de421b320a296ac58 diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c index 4b365488c58b..84337e63fadf 100644 --- a/trunk/sound/pci/hda/patch_conexant.c +++ b/trunk/sound/pci/hda/patch_conexant.c @@ -1086,7 +1086,6 @@ static int patch_cxt5045(struct hda_codec *codec) if (!spec) return -ENOMEM; codec->spec = spec; - codec->pin_amp_workaround = 1; codec->single_adc_amp = 1; spec->multiout.max_channels = 2; @@ -4443,7 +4442,6 @@ static int patch_conexant_auto(struct hda_codec *codec) if (!spec) return -ENOMEM; codec->spec = spec; - codec->pin_amp_workaround = 1; switch (codec->vendor_id) { case 0x14f15045: @@ -4451,7 +4449,10 @@ static int patch_conexant_auto(struct hda_codec *codec) break; case 0x14f15051: add_cx5051_fake_mutes(codec); + codec->pin_amp_workaround = 1; break; + default: + codec->pin_amp_workaround = 1; } apply_pin_fixup(codec, cxt_fixups, cxt_pincfg_tbl);