diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-09 18:02:02 -0400 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /sound/pci/hda/patch_via.c | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 7135a71b19be1faf48b7148d77844d03bc0717d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 9008b4b013aa..e8f10b10cceb 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -1395,6 +1395,7 @@ static int patch_vt1708(struct hda_codec *codec) | |||
| 1395 | if (!spec->adc_nids && spec->input_mux) { | 1395 | if (!spec->adc_nids && spec->input_mux) { |
| 1396 | spec->adc_nids = vt1708_adc_nids; | 1396 | spec->adc_nids = vt1708_adc_nids; |
| 1397 | spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids); | 1397 | spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids); |
| 1398 | get_mux_nids(codec); | ||
| 1398 | spec->mixers[spec->num_mixers] = vt1708_capture_mixer; | 1399 | spec->mixers[spec->num_mixers] = vt1708_capture_mixer; |
| 1399 | spec->num_mixers++; | 1400 | spec->num_mixers++; |
| 1400 | } | 1401 | } |