diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-08-31 08:27:10 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-08-31 08:27:10 +0200 |
| commit | be0ae923a40bbee8a0f02c1cd4b70656e729096f (patch) | |
| tree | fa18d300c59e7845c08290346587186c2890cff7 /sound/pci/hda/patch_via.c | |
| parent | e9af4f365fee8065c0c1b2389fe10e540dd9d60a (diff) | |
| parent | a3f730af7e33cea10ea66f05b2565fde1f9512df (diff) | |
| download | blackbird-op-linux-be0ae923a40bbee8a0f02c1cd4b70656e729096f.tar.gz blackbird-op-linux-be0ae923a40bbee8a0f02c1cd4b70656e729096f.zip | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
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 ab90abb04ccd..ee89db90c9b6 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1394,6 +1394,7 @@ static int patch_vt1708(struct hda_codec *codec) if (!spec->adc_nids && spec->input_mux) { spec->adc_nids = vt1708_adc_nids; spec->num_adc_nids = ARRAY_SIZE(vt1708_adc_nids); + get_mux_nids(codec); spec->mixers[spec->num_mixers] = vt1708_capture_mixer; spec->num_mixers++; } |
