summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-15 12:35:04 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-15 12:35:04 +0200
commit9b842cd86843db0f6ba4badb30282044afaed6c9 (patch)
treecd6b0b9dea8c26721b48b382584ede74f236b3b1 /sound/pci
parent1387cde51d0946eb3d8091b63f025c40cc1acdf4 (diff)
downloadlinux-9b842cd86843db0f6ba4badb30282044afaed6c9.tar.bz2
ALSA: hda - Don't use auto-parser for cxt5045 / 5051 as default
Just for safety reason (for avoiding any possible regressions), don't enable auto-parser as default for cxt5045 and 5051, as well as 5047. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index fb759bff91a9..6c9abee9ce82 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/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);