From 00be9a13cc37af0c90ca2b358bef16e647f96fd3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Dec 2009 15:01:31 +0100 Subject: [PATCH] --- yaml --- r: 182639 b: refs/heads/master c: d1409ae4cecb4af260759bdfdf88fafca23a9940 h: refs/heads/master i: 182637: 222181c10f2e7d5dbbcd0c5b05b4fa8a8b68669f 182635: 9b18a9790f55395ea4c1e16a14cd8f000526fa2b 182631: 04e6d140e88d4fd95b3ccfeab71361a1296c2e21 182623: 3a17387cc93b3aa681f79b7478b5302df7484daa v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c7568f3581d6..7d67f644d4f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e671deb8547638f6504c5f20126b14f5563690d +refs/heads/master: d1409ae4cecb4af260759bdfdf88fafca23a9940 diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index 36556b10357a..012435212e58 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/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;