Skip to content

Commit

Permalink
ALSA: hda - Fix NULL dereference in kctl-NID mapping in patch_realtek.c
Browse files Browse the repository at this point in the history
capsrc_nids can be NULL, and adc_nids should be taken as fallback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Dec 17, 2009
1 parent 9e671de commit d1409ae
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d1409ae

Please sign in to comment.