From 005cb4deff6ee83ea27c4273536b833d5c3115cf Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 15 May 2011 12:21:20 +0200
Subject: [PATCH] --- yaml --- r: 248473 b: refs/heads/master c:
 1387cde51d0946eb3d8091b63f025c40cc1acdf4 h: refs/heads/master i:   248471:
 03825c16cdb827996bdbd6f1f0f0241b0ed75144 v: v3

---
 [refs]                               |  2 +-
 trunk/sound/pci/hda/patch_conexant.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 2eb9529c1a61..0fd4b77327fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22ce5f74a954d02e56352ecfa45f8d7c817693e7
+refs/heads/master: 1387cde51d0946eb3d8091b63f025c40cc1acdf4
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index ebce2fe3aec2..fb759bff91a9 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/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);