diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-13 14:55:02 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-13 15:06:09 +0400 |
| commit | 71b1e9e43d5199f57c109e20c0f4dffc5c048130 (patch) | |
| tree | f8e5b6bcc8eb8de6813d6d9bdc382dacb5a48467 /sound | |
| parent | a9c74173f4be2a536ef8d8c88642e41527f2d8b4 (diff) | |
| download | linux-71b1e9e43d5199f57c109e20c0f4dffc5c048130.tar.xz | |
ALSA: hda - Add codec->no_jack_detect flag
Add a new flag to indicate that the codec has no jack-detection cap.
This flag should be set for hardwares that have no jack-detect
implementation although the codec chip itself supports it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -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 { unsigned int pins_shutup:1; /* pins are shut up */ unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */ unsigned int ignore_misc_bit:1; /* ignore MISC_NO_PRESENCE bit */ + unsigned int no_jack_detect:1; /* Machine has no jack-detection */ #ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ 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 @@ bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) { + if (codec->no_jack_detect) + return false; if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT)) return false; if (!codec->ignore_misc_bit && |