summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-23 12:51:55 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-23 12:51:55 +0100
commit52ca15b7c0c711eb37f5e4b769e8488e5c516d43 (patch)
treed76572afec2ea99d4a095eb6cdee27626f21506f /sound
parent234b4346a064f8a2a488da10b3c1e640fb778a17 (diff)
downloadlinux-52ca15b7c0c711eb37f5e4b769e8488e5c516d43.tar.bz2
ALSA: hda - Avoid output amp manipulation to digital mic pins
Don't set amp-out values to pins without PINCAP_OUT capability, which are usually assigned for digital mics on ALC663/ALC272. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b69d9864f6f3..965a531d2fba 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -16750,6 +16750,12 @@ static int alc662_is_input_pin(struct hda_codec *codec, hda_nid_t nid)
return (pincap & AC_PINCAP_IN) != 0;
}
+static int alc662_is_output_pin(struct hda_codec *codec, hda_nid_t nid)
+{
+ unsigned int pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+ return (pincap & AC_PINCAP_OUT) != 0;
+}
+
/* create playback/capture controls for input pins */
static int alc662_auto_create_analog_input_ctls(struct hda_codec *codec,
const struct auto_pin_cfg *cfg)
@@ -16837,7 +16843,8 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec)
hda_nid_t nid = spec->autocfg.input_pins[i];
if (alc662_is_input_pin(codec, nid)) {
alc_set_input_pin(codec, nid, i);
- if (nid != ALC662_PIN_CD_NID)
+ if (nid != ALC662_PIN_CD_NID &&
+ alc662_is_output_pin(codec, nid))
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_MUTE);