From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 19 Apr 2012 15:13:03 +0000 (+0200)
Subject: Merge branch 'fix/cxt-stable' into fix/hda
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c817eebec5971febab86d397582954bd52f403a8;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'fix/cxt-stable' into fix/hda

Merge fixes for Thinkpad docking-station regressions for 3.3 kernels
back to 3.4.  These were committed in that branch to make the stable
merging easier.

Conflicts:
	sound/pci/hda/patch_conexant.c
---

c817eebec5971febab86d397582954bd52f403a8
diff --cc sound/pci/hda/patch_conexant.c
index a36488d94aaa,58b5de4a6eed..d906c5b74cf0
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@@ -4445,23 -4441,10 +4470,23 @@@ static int patch_conexant_auto(struct h
  		break;
  	case 0x14f15051:
  		add_cx5051_fake_mutes(codec);
 +		codec->pin_amp_workaround = 1;
+ 		apply_pin_fixup(codec, cxt5051_fixups, cxt_pincfg_tbl);
  		break;
  	default:
 +		codec->pin_amp_workaround = 1;
+ 		apply_pin_fixup(codec, cxt5066_fixups, cxt_pincfg_tbl);
 +	}
 +
- 	apply_pin_fixup(codec, cxt_fixups, cxt_pincfg_tbl);
- 
 +	/* Show mute-led control only on HP laptops
 +	 * This is a sort of white-list: on HP laptops, EAPD corresponds
 +	 * only to the mute-LED without actualy amp function.  Meanwhile,
 +	 * others may use EAPD really as an amp switch, so it might be
 +	 * not good to expose it blindly.
 +	 */
 +	switch (codec->subsystem_id >> 16) {
 +	case 0x103c:
 +		spec->vmaster_mute_led = 1;
  		break;
  	}