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);