diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-08-11 02:47:38 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-11 02:47:38 -0400 |
commit | 52b5deefbbd7493092b1cbc35da09e0e2ad46cca (patch) | |
tree | 929f68597437aeb0a77f7ded5b7e3593fce4094a | |
parent | 2a22d3f81283253ab9dae9244f3ca58a5ac66b36 (diff) | |
parent | dd704698f56c1451fc9c5daadcd6e3a089de2c40 (diff) |
Merge branch 'fix/hda' into topic/hda
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7ecf929b97a5..2c348e1339d8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -15554,9 +15554,12 @@ static int patch_alc861vd(struct hda_codec *codec) | |||
15554 | spec->stream_digital_playback = &alc861vd_pcm_digital_playback; | 15554 | spec->stream_digital_playback = &alc861vd_pcm_digital_playback; |
15555 | spec->stream_digital_capture = &alc861vd_pcm_digital_capture; | 15555 | spec->stream_digital_capture = &alc861vd_pcm_digital_capture; |
15556 | 15556 | ||
15557 | spec->adc_nids = alc861vd_adc_nids; | 15557 | if (!spec->adc_nids) { |
15558 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); | 15558 | spec->adc_nids = alc861vd_adc_nids; |
15559 | spec->capsrc_nids = alc861vd_capsrc_nids; | 15559 | spec->num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids); |
15560 | } | ||
15561 | if (!spec->capsrc_nids) | ||
15562 | spec->capsrc_nids = alc861vd_capsrc_nids; | ||
15560 | 15563 | ||
15561 | set_capture_mixer(spec); | 15564 | set_capture_mixer(spec); |
15562 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); | 15565 | set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); |
@@ -17454,9 +17457,12 @@ static int patch_alc662(struct hda_codec *codec) | |||
17454 | spec->stream_digital_playback = &alc662_pcm_digital_playback; | 17457 | spec->stream_digital_playback = &alc662_pcm_digital_playback; |
17455 | spec->stream_digital_capture = &alc662_pcm_digital_capture; | 17458 | spec->stream_digital_capture = &alc662_pcm_digital_capture; |
17456 | 17459 | ||
17457 | spec->adc_nids = alc662_adc_nids; | 17460 | if (!spec->adc_nids) { |
17458 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); | 17461 | spec->adc_nids = alc662_adc_nids; |
17459 | spec->capsrc_nids = alc662_capsrc_nids; | 17462 | spec->num_adc_nids = ARRAY_SIZE(alc662_adc_nids); |
17463 | } | ||
17464 | if (!spec->capsrc_nids) | ||
17465 | spec->capsrc_nids = alc662_capsrc_nids; | ||
17460 | 17466 | ||
17461 | if (!spec->cap_mixer) | 17467 | if (!spec->cap_mixer) |
17462 | set_capture_mixer(spec); | 17468 | set_capture_mixer(spec); |