diff --git a/[refs] b/[refs]
index 0fd4b77327fa..0b92d1759a8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1387cde51d0946eb3d8091b63f025c40cc1acdf4
+refs/heads/master: 9b842cd86843db0f6ba4badb30282044afaed6c9
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index fb759bff91a9..6c9abee9ce82 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -1104,8 +1104,10 @@ static int patch_cxt5045(struct hda_codec *codec)
 	board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
 						  cxt5045_models,
 						  cxt5045_cfg_tbl);
+#if 0 /* use the old method just for safety */
 	if (board_config < 0)
 		board_config = CXT5045_AUTO;
+#endif
 	if (board_config == CXT5045_AUTO)
 		return patch_conexant_auto(codec);
 
@@ -1972,8 +1974,10 @@ static int patch_cxt5051(struct hda_codec *codec)
 	board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
 						  cxt5051_models,
 						  cxt5051_cfg_tbl);
+#if 0 /* use the old method just for safety */
 	if (board_config < 0)
 		board_config = CXT5051_AUTO;
+#endif
 	if (board_config == CXT5051_AUTO)
 		return patch_conexant_auto(codec);