From: Matthew Ranostay <mranostay@embeddedalley.com>
Date: Sat, 20 Dec 2008 22:36:28 +0000 (-0500)
Subject: ALSA: hda: dinput_mux check
X-Git-Tag: 2.1b_release~14984^2~6^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8ccbf65afde5df81a6238b9dc92868fbbd397f7;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

ALSA: hda: dinput_mux check

Add check to determine if dinput_mux is set by any of patch_stac*() functions,
otherwise a invalid pointer my be referenced causing gibberish to mixer values.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index e2941cd..7ee4d4d 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3589,7 +3589,8 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
 		spec->mixers[spec->num_mixers++] = spec->kctls.list;
 
 	spec->input_mux = &spec->private_imux;
-	spec->dinput_mux = &spec->private_dimux;
+	if (!spec->dinput_mux)
+		spec->dinput_mux = &spec->private_dimux;
 	spec->sinput_mux = &spec->private_smux;
 	spec->mono_mux = &spec->private_mono_mux;
 	spec->amp_mux = &spec->private_amp_mux;