]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Avoid output amp manipulation to digital mic pins
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 11:51:55 +0000 (12:51 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 11:51:55 +0000 (12:51 +0100)
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>
sound/pci/hda/patch_realtek.c

index b69d9864f6f3d3ea7784011ff60f53468efad52a..965a531d2fba366a0870fc1a5bf938d4aac1dae3 100644 (file)
@@ -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);