Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da2a2aaa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 1972d025

sound/pci/hda/patch_sigmatel.c

+3 −2
Original line number Diff line number Diff line
@@ -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);
@@ -4373,6 +4373,7 @@ static int stac92xx_init(struct hda_codec *codec) 
	}

	if (spec->auto_mic) {

		/* initialize connection to analog input */

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