Skip to content

Commit

Permalink
ALSA: hda - give 3-pin jack the name "Headphone Mic Jack"
Browse files Browse the repository at this point in the history
This 3-pin jack was labeled "Headphone Jack", but it could also be
used as a mic jack just by switching "Input Source". Therefore we need
to call the jack something else, to make sure PulseAudio can use the
speaker together with the external mic. (PulseAudio might mute the
speaker if it detects a headphone being plugged in.)

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
David Henningsson authored and Takashi Iwai committed Jun 27, 2012
1 parent 00227f1 commit 5780b62
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -2001,13 +2001,31 @@ static int __alc_build_controls(struct hda_codec *codec)
return 0;
}

static int alc_build_controls(struct hda_codec *codec)
static int alc_build_jacks(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;

if (spec->shared_mic_hp) {
int err;
int nid = spec->autocfg.inputs[1].pin;
err = snd_hda_jack_add_kctl(codec, nid, "Headphone Mic", 0);
if (err < 0)
return err;
err = snd_hda_jack_detect_enable(codec, nid, 0);
if (err < 0)
return err;
}

return snd_hda_jack_add_kctls(codec, &spec->autocfg);
}

static int alc_build_controls(struct hda_codec *codec)
{
int err = __alc_build_controls(codec);
if (err < 0)
return err;
err = snd_hda_jack_add_kctls(codec, &spec->autocfg);

err = alc_build_jacks(codec);
if (err < 0)
return err;
alc_apply_fixup(codec, ALC_FIXUP_ACT_BUILD);
Expand Down

0 comments on commit 5780b62

Please sign in to comment.