From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 17 Dec 2009 14:01:31 +0000 (+0100)
Subject: ALSA: hda - Fix NULL dereference in kctl-NID mapping in patch_realtek.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1409ae4cecb4af260759bdfdf88fafca23a9940;p=linux-beck.git

ALSA: hda - Fix NULL dereference in kctl-NID mapping in patch_realtek.c

capsrc_nids can be NULL, and adc_nids should be taken as fallback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 36556b10357a..012435212e58 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2517,7 +2517,10 @@ static int alc_build_controls(struct hda_codec *codec)
 	if (!kctl)
 		kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
 	for (i = 0; kctl && i < kctl->count; i++) {
-		err = snd_hda_add_nids(codec, kctl, i, spec->capsrc_nids,
+		hda_nid_t *nids = spec->capsrc_nids;
+		if (!nids)
+			nids = spec->adc_nids;
+		err = snd_hda_add_nids(codec, kctl, i, nids,
 				       spec->input_mux->num_items);
 		if (err < 0)
 			return err;