From a0a87567bf3e90d133100e32558d1e44beed641e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 7 Jan 2013 16:32:11 +0100 Subject: [PATCH] --- yaml --- r: 353107 b: refs/heads/master c: d12daf6f41693b6b34351b37b6d05d1a6f9b3472 h: refs/heads/master i: 353105: 8f754cf4cd0dde2399b96babb4866195e9a3b5b2 353103: cf0a821c5aae07a72deb6f0a741053f1980a8a9b v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 3 +++ trunk/sound/pci/hda/hda_generic.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ff7a4fc9a19..7298d2445696 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb690cf58278163b464e3ea8b76ad31e07fb140c +refs/heads/master: d12daf6f41693b6b34351b37b6d05d1a6f9b3472 diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 8e7ce7d2c138..b488c62ed97d 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -3034,6 +3034,9 @@ static int check_auto_mic_availability(struct hda_codec *codec) unsigned int types; int i, num_pins; + if (spec->suppress_auto_mic) + return 0; + types = 0; num_pins = 0; for (i = 0; i < cfg->num_inputs; i++) { diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h index 343195c827e4..1763e33b90ef 100644 --- a/trunk/sound/pci/hda/hda_generic.h +++ b/trunk/sound/pci/hda/hda_generic.h @@ -175,6 +175,7 @@ struct hda_gen_spec { unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */ unsigned int automute_lo_possible:1; /* there are line outs and HP */ unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */ + unsigned int suppress_auto_mic:1; /* suppress input jack auto switch */ unsigned int line_in_auto_switch:1; /* allow line-in auto switch */ /* other flags */