diff options
-rw-r--r-- | sound/pci/hda/hda_codec.h | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_jack.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index e9f71dc0d464..654d2e41e25d 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -852,6 +852,7 @@ struct hda_codec { | |||
852 | unsigned int pins_shutup:1; /* pins are shut up */ | 852 | unsigned int pins_shutup:1; /* pins are shut up */ |
853 | unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ | 853 | unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ |
854 | unsigned int ignore_misc_bit:1; /* ignore MISC_NO_PRESENCE bit */ | 854 | unsigned int ignore_misc_bit:1; /* ignore MISC_NO_PRESENCE bit */ |
855 | unsigned int no_jack_detect:1; /* Machine has no jack-detection */ | ||
855 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 856 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
856 | unsigned int power_on :1; /* current (global) power-state */ | 857 | unsigned int power_on :1; /* current (global) power-state */ |
857 | unsigned int power_transition :1; /* power-state in transition */ | 858 | unsigned int power_transition :1; /* power-state in transition */ |
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c index ac7e57c40398..d68948499fbc 100644 --- a/sound/pci/hda/hda_jack.c +++ b/sound/pci/hda/hda_jack.c | |||
@@ -21,6 +21,8 @@ | |||
21 | 21 | ||
22 | bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) | 22 | bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) |
23 | { | 23 | { |
24 | if (codec->no_jack_detect) | ||
25 | return false; | ||
24 | if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT)) | 26 | if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT)) |
25 | return false; | 27 | return false; |
26 | if (!codec->ignore_misc_bit && | 28 | if (!codec->ignore_misc_bit && |