On Fri, 01 Nov 2019 12:57:18 +0100, Jaroslav Kysela wrote:

The HDA auto parser creates kcontrol 'Headset Mic Jack'. Use this name also for the alc_fixup_headset_jack() function. It is necessary to have common name for the user space like the UCM configs:

https://github.com/alsa-project/alsa-ucm-conf/pull/5

Please make sure that this really doesn't break the existing device especially with PulseAudio. I'll merge this once when it's confirmed that it still works as is after the change.

thanks,

Takashi

Signed-off-by: Jaroslav Kysela perex@perex.cz Cc: Kailang Yang kailang@realtek.com

---

sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 80f66ba85f87..2633e45144d5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5679,7 +5679,7 @@ static void alc_fixup_headset_jack(struct hda_codec *codec, case HDA_FIXUP_ACT_PRE_PROBE: snd_hda_jack_detect_enable_callback(codec, 0x55, alc_headset_btn_callback);

• snd_hda_jack_add_kctl(codec, 0x55, "Headset Jack", false,
  

• snd_hda_jack_add_kctl(codec, 0x55, "Headset Mic Jack", false,
  	      SND_JACK_HEADSET, alc_headset_btn_keymap);
  

  break; case HDA_FIXUP_ACT_INIT:

-- 2.20.1