aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-08-10 01:44:09 -0400
committerTakashi Iwai <tiwai@suse.de>2009-08-10 01:44:09 -0400
commitda2a2aaa8e3dddb41678af7e5295d9e3e6c030a4 (patch)
tree7d18ea7ffebaa242df35cb994e49aad35aafca40 /sound/pci
parent1972d02504b142a6f1442bd987a8831146031d3d (diff)
ALSA: hda - Fix Oops due to STAC/IDT auto-mic changes
The previous auto-mic patch for STAC/IDT codecs causes the Oops on machines without digital mic pins. This patch fixes the problem. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_sigmatel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 163aad599b6a..276073060576 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3671,7 +3671,7 @@ static int set_mic_route(struct hda_codec *codec,
3671 if (i < 0) 3671 if (i < 0)
3672 return -1; 3672 return -1;
3673 mic->mux_idx = i; 3673 mic->mux_idx = i;
3674 } else { 3674 } else if (spec->dmux_nids) {
3675 /* digital pin */ 3675 /* digital pin */
3676 mic->mux_idx = 0; 3676 mic->mux_idx = 0;
3677 i = get_connection_index(codec, spec->dmux_nids[0], pin); 3677 i = get_connection_index(codec, spec->dmux_nids[0], pin);
@@ -4373,7 +4373,8 @@ static int stac92xx_init(struct hda_codec *codec)
4373 } 4373 }
4374 if (spec->auto_mic) { 4374 if (spec->auto_mic) {
4375 /* initialize connection to analog input */ 4375 /* initialize connection to analog input */
4376 snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0, 4376 if (spec->dmux_nids)
4377 snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0,
4377 AC_VERB_SET_CONNECT_SEL, 0); 4378 AC_VERB_SET_CONNECT_SEL, 0);
4378 if (enable_pin_detect(codec, spec->ext_mic.pin, STAC_MIC_EVENT)) 4379 if (enable_pin_detect(codec, spec->ext_mic.pin, STAC_MIC_EVENT))
4379 stac_issue_unsol_event(codec, spec->ext_mic.pin); 4380 stac_issue_unsol_event(codec, spec->ext_mic.pin);