From da2a2aaa8e3dddb41678af7e5295d9e3e6c030a4 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 Aug 2009 07:44:09 +0200
Subject: 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>
---
sound/pci/hda/patch_sigmatel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'sound/pci')
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 163aad5..2760730 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,
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,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);
--
cgit v1.1