Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 260963
b: refs/heads/master
c: 60a6a84
h: refs/heads/master
i:
  260961: 76ee072
  260959: bf904ee
v: v3
  • Loading branch information
Takashi Iwai committed Jul 27, 2011
1 parent c731371 commit 65c2b9d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 767cd365b22820df07b962b49ce04b220b98e537
refs/heads/master: 60a6a8425a84fa46a3831ce79197640b8224311b
22 changes: 11 additions & 11 deletions trunk/sound/pci/hda/patch_realtek.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1911,7 +1911,7 @@ static int alc_build_controls(struct hda_codec *codec)
return err;
}
}
if (spec->cap_mixer) {
if (spec->cap_mixer && spec->adc_nids) {
const char *kname = kctl ? kctl->id.name : NULL;
for (knew = spec->cap_mixer; knew->name; knew++) {
if (kname && strcmp(knew->name, kname) == 0)
Expand Down Expand Up @@ -3677,7 +3677,7 @@ static int patch_alc880(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc880_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -3804,7 +3804,7 @@ static int patch_alc260(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc260_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -3983,7 +3983,7 @@ static int patch_alc882(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc882_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -4137,7 +4137,7 @@ static int patch_alc262(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc262_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -4293,7 +4293,7 @@ static int patch_alc268(struct hda_codec *codec)
(0 << AC_AMPCAP_MUTE_SHIFT));
}

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -4705,7 +4705,7 @@ static int patch_alc269(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc269_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -4843,7 +4843,7 @@ static int patch_alc861(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc861_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -4984,7 +4984,7 @@ static int patch_alc861vd(struct hda_codec *codec)
add_verb(spec, alc660vd_eapd_verbs);
}

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -5200,7 +5200,7 @@ static int patch_alc662(struct hda_codec *codec)
if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc662_presets[board_config]);

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down Expand Up @@ -5336,7 +5336,7 @@ static int patch_alc680(struct hda_codec *codec)
#endif
}

if (!spec->no_analog && !spec->adc_nids && spec->input_mux) {
if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
alc_rebuild_imux_for_auto_mic(codec);
alc_remove_invalid_adc_nids(codec);
Expand Down

0 comments on commit 65c2b9d

Please sign in to comment.