Skip to content

Commit

Permalink
ALSA: hda - Fix Oops due to STAC/IDT auto-mic changes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Aug 10, 2009
1 parent 1972d02 commit da2a2aa
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -3671,7 +3671,7 @@ static int set_mic_route(struct hda_codec *codec,
if (i < 0)
return -1;
mic->mux_idx = i;
} else {
} else if (spec->dmux_nids) {
/* digital pin */
mic->mux_idx = 0;
i = get_connection_index(codec, spec->dmux_nids[0], pin);
Expand Down Expand Up @@ -4373,7 +4373,8 @@ static int stac92xx_init(struct hda_codec *codec)
}
if (spec->auto_mic) {
/* initialize connection to analog input */
snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0,
if (spec->dmux_nids)
snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0,
AC_VERB_SET_CONNECT_SEL, 0);
if (enable_pin_detect(codec, spec->ext_mic.pin, STAC_MIC_EVENT))
stac_issue_unsol_event(codec, spec->ext_mic.pin);
Expand Down

0 comments on commit da2a2aa

Please sign in to comment.