aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_sigmatel.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-18 02:00:14 -0500
committerTakashi Iwai <tiwai@suse.de>2009-11-18 02:00:14 -0500
commitd56757abc11a21996d9839c0d4e3b2c3666cd318 (patch)
tree831cc331f8901ed17c3294a31dc545d7954f1a2c /sound/pci/hda/patch_sigmatel.c
parent83d605fd63e704419ccb92d48b735c6890ce3d6a (diff)
ALSA: hda - Replace the rest of jack-detections with snd_hda_jack_detect()
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r--sound/pci/hda/patch_sigmatel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 7f76a97954f9..d83649c25fb2 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4413,14 +4413,11 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
4413 pin_ctl & ~flag); 4413 pin_ctl & ~flag);
4414} 4414}
4415 4415
4416static int get_pin_presence(struct hda_codec *codec, hda_nid_t nid) 4416static inline int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
4417{ 4417{
4418 if (!nid) 4418 if (!nid)
4419 return 0; 4419 return 0;
4420 if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0x00) 4420 return snd_hda_jack_detect(codec, nid);
4421 & (1 << 31))
4422 return 1;
4423 return 0;
4424} 4421}
4425 4422
4426static void stac92xx_line_out_detect(struct hda_codec *codec, 4423static void stac92xx_line_out_detect(struct hda_codec *codec,