From: David Henningsson Date: Fri, 18 Jan 2013 14:43:01 +0000 (+0100) Subject: ALSA: hda - make sure there are enough input labels and paths X-Git-Tag: upstream/snapshot3+hdmi~5621^2~77^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3d982f7447ba9f5cbb57c1a525c3b61bfcffc37;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ALSA: hda - make sure there are enough input labels and paths I found a codec configuration which had six inputs, so the max of five was not appropriate. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 174806e..10b14a9 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2652,7 +2652,7 @@ static struct nid_path *get_input_path(struct hda_codec *codec, int adc_idx, int } if (spec->dyn_adc_switch) adc_idx = spec->dyn_adc_idx[imux_idx]; - if (adc_idx < 0 || adc_idx >= AUTO_CFG_MAX_OUTS) { + if (adc_idx < 0 || adc_idx >= AUTO_CFG_MAX_INS) { snd_BUG(); return NULL; } diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 594a9cc..eacfca9 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -105,8 +105,8 @@ struct hda_gen_spec { hda_nid_t adc_nids[AUTO_CFG_MAX_OUTS]; hda_nid_t dig_in_nid; /* digital-in NID; optional */ hda_nid_t mixer_nid; /* analog-mixer NID */ - const char *input_labels[AUTO_CFG_MAX_OUTS]; - int input_label_idxs[AUTO_CFG_MAX_OUTS]; + const char *input_labels[AUTO_CFG_MAX_INS]; + int input_label_idxs[AUTO_CFG_MAX_INS]; /* capture setup for dynamic dual-adc switch */ hda_nid_t cur_adc; @@ -159,7 +159,7 @@ struct hda_gen_spec { int speaker_paths[AUTO_CFG_MAX_OUTS]; int aamix_out_paths[3]; int digout_paths[AUTO_CFG_MAX_OUTS]; - int input_paths[HDA_MAX_NUM_INPUTS][AUTO_CFG_MAX_OUTS]; + int input_paths[HDA_MAX_NUM_INPUTS][AUTO_CFG_MAX_INS]; int loopback_paths[HDA_MAX_NUM_INPUTS]; int digin_path;