renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
Code

Merge branch 'fix/hda' into topic/hda

Browse Source
This commit is contained in:
Takashi Iwai 2009-08-11 08:47:38 +02:00
commit 52b5deefbb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/pci/hda/patch_realtek.c
View File

@ -15554,9 +15554,12 @@ static int patch_alc861vd(struct hda_codec *codec)
spec->stream_digital_playback = &alc861vd_pcm_digital_playback; spec->stream_digital_playback = &alc861vd_pcm_digital_playback;
spec->stream_digital_capture = &alc861vd_pcm_digital_capture; spec->stream_digital_capture = &alc861vd_pcm_digital_capture;
spec->adc_nids = alc861vd_adc_nids; if (!spec->adc_nids) {
spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); spec->adc_nids = alc861vd_adc_nids;
spec->capsrc_nids = alc861vd_capsrc_nids; spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids);
}
if (!spec->capsrc_nids)
spec->capsrc_nids = alc861vd_capsrc_nids;
set_capture_mixer(spec); set_capture_mixer(spec);
set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
@ -17454,9 +17457,12 @@ static int patch_alc662(struct hda_codec *codec)
spec->stream_digital_playback = &alc662_pcm_digital_playback; spec->stream_digital_playback = &alc662_pcm_digital_playback;
spec->stream_digital_capture = &alc662_pcm_digital_capture; spec->stream_digital_capture = &alc662_pcm_digital_capture;
spec->adc_nids = alc662_adc_nids; if (!spec->adc_nids) {
spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); spec->adc_nids = alc662_adc_nids;
spec->capsrc_nids = alc662_capsrc_nids; spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids);
}
if (!spec->capsrc_nids)
spec->capsrc_nids = alc662_capsrc_nids;
if (!spec->cap_mixer) if (!spec->cap_mixer)
set_capture_mixer(spec); set_capture_mixer(spec);