diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-05-11 12:12:23 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:33:35 -0400 |
commit | 0defb2672d7cde8d048eec35c183da7b88adbd9e (patch) | |
tree | b74310bf01b6b9c117db3b89c7cc655e6fa3701b | |
parent | ed7cbe3e4175e5fe9386793fbffee786840d7e9c (diff) |
[ALSA] hda-codec - Fix handling of capture controls on ALC882 3/6-stack models
Fixed the handling of capture controls on ALC882 3/6-stack models.
Now the driver checks the availability of NID 07h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f6bccd66d141..0fc2f77dce2c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -4099,21 +4099,6 @@ static struct snd_kcontrol_new alc882_base_mixer[] = { | |||
4099 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), | 4099 | HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), |
4100 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 4100 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
4101 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 4101 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
4102 | HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), | ||
4103 | HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), | ||
4104 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT), | ||
4105 | HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT), | ||
4106 | HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT), | ||
4107 | HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT), | ||
4108 | { | ||
4109 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
4110 | /* .name = "Capture Source", */ | ||
4111 | .name = "Input Source", | ||
4112 | .count = 3, | ||
4113 | .info = alc882_mux_enum_info, | ||
4114 | .get = alc882_mux_enum_get, | ||
4115 | .put = alc882_mux_enum_put, | ||
4116 | }, | ||
4117 | { } /* end */ | 4102 | { } /* end */ |
4118 | }; | 4103 | }; |
4119 | 4104 | ||
@@ -4347,8 +4332,6 @@ static struct alc_config_preset alc882_presets[] = { | |||
4347 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), | 4332 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), |
4348 | .dac_nids = alc882_dac_nids, | 4333 | .dac_nids = alc882_dac_nids, |
4349 | .dig_out_nid = ALC882_DIGOUT_NID, | 4334 | .dig_out_nid = ALC882_DIGOUT_NID, |
4350 | .num_adc_nids = ARRAY_SIZE(alc882_adc_nids), | ||
4351 | .adc_nids = alc882_adc_nids, | ||
4352 | .dig_in_nid = ALC882_DIGIN_NID, | 4335 | .dig_in_nid = ALC882_DIGIN_NID, |
4353 | .num_channel_mode = ARRAY_SIZE(alc882_ch_modes), | 4336 | .num_channel_mode = ARRAY_SIZE(alc882_ch_modes), |
4354 | .channel_mode = alc882_ch_modes, | 4337 | .channel_mode = alc882_ch_modes, |
@@ -4360,8 +4343,6 @@ static struct alc_config_preset alc882_presets[] = { | |||
4360 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), | 4343 | .num_dacs = ARRAY_SIZE(alc882_dac_nids), |
4361 | .dac_nids = alc882_dac_nids, | 4344 | .dac_nids = alc882_dac_nids, |
4362 | .dig_out_nid = ALC882_DIGOUT_NID, | 4345 | .dig_out_nid = ALC882_DIGOUT_NID, |
4363 | .num_adc_nids = ARRAY_SIZE(alc882_adc_nids), | ||
4364 | .adc_nids = alc882_adc_nids, | ||
4365 | .dig_in_nid = ALC882_DIGIN_NID, | 4346 | .dig_in_nid = ALC882_DIGIN_NID, |
4366 | .num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes), | 4347 | .num_channel_mode = ARRAY_SIZE(alc882_sixstack_modes), |
4367 | .channel_mode = alc882_sixstack_modes, | 4348 | .channel_mode = alc882_sixstack_modes, |