diff options
| author |   David Henningsson <david.henningsson@canonical.com> | 2013-01-18 15:43:01 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2013-01-18 15:48:13 +0100 |
| commit | d3d982f7447ba9f5cbb57c1a525c3b61bfcffc37 (patch) | |
| tree | f00b5c9d5de1e8ffc4b86343a761b7d8ab09e92f /sound/pci/hda/hda_generic.h | |
| parent | ALSA: hda - Fix speaker pin of FSC Lifebook S7110 laptop (diff) | |
| download | linux-dev-d3d982f7447ba9f5cbb57c1a525c3b61bfcffc37.tar.xz linux-dev-d3d982f7447ba9f5cbb57c1a525c3b61bfcffc37.zip | |
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 <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 594a9cc4ecca..eacfca93215a 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; |