diff options
-rw-r--r-- | sound/pci/hda/hda_generic.c | 3 | ||||
-rw-r--r-- | sound/pci/hda/hda_generic.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 8e7ce7d2c138..b488c62ed97d 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
@@ -3034,6 +3034,9 @@ static int check_auto_mic_availability(struct hda_codec *codec) | |||
3034 | unsigned int types; | 3034 | unsigned int types; |
3035 | int i, num_pins; | 3035 | int i, num_pins; |
3036 | 3036 | ||
3037 | if (spec->suppress_auto_mic) | ||
3038 | return 0; | ||
3039 | |||
3037 | types = 0; | 3040 | types = 0; |
3038 | num_pins = 0; | 3041 | num_pins = 0; |
3039 | for (i = 0; i < cfg->num_inputs; i++) { | 3042 | for (i = 0; i < cfg->num_inputs; i++) { |
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 343195c827e4..1763e33b90ef 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h | |||
@@ -175,6 +175,7 @@ struct hda_gen_spec { | |||
175 | unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */ | 175 | unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */ |
176 | unsigned int automute_lo_possible:1; /* there are line outs and HP */ | 176 | unsigned int automute_lo_possible:1; /* there are line outs and HP */ |
177 | unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */ | 177 | unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */ |
178 | unsigned int suppress_auto_mic:1; /* suppress input jack auto switch */ | ||
178 | unsigned int line_in_auto_switch:1; /* allow line-in auto switch */ | 179 | unsigned int line_in_auto_switch:1; /* allow line-in auto switch */ |
179 | 180 | ||
180 | /* other flags */ | 181 | /* other flags */ |