Unverified Commit 42871e95 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working 



Commit 1d25684e ("ASoC: nau8824: Fix open coded prefix handling")
replaced the nau8824_dapm_enable_pin() helper with direct calls to
snd_soc_dapm_enable_pin(), but the helper was using
snd_soc_dapm_force_enable_pin() and not forcing the MICBIAS + SAR
supplies on breaks headphone vs headset and button-press detection.

Replace the snd_soc_dapm_enable_pin() calls with
snd_soc_dapm_force_enable_pin() to fix this.

Cc: stable@vger.kernel.org
Fixes: 1d25684e ("ASoC: nau8824: Fix open coded prefix handling")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210929201512.460360-1-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0cc3687e

sound/soc/codecs/nau8824.c

+2 −2
Original line number Diff line number Diff line
@@ -867,8 +867,8 @@ static void nau8824_jdet_work(struct work_struct *work) 
	struct regmap *regmap = nau8824->regmap;

	int adc_value, event = 0, event_mask = 0;



	snd_soc_dapm_enable_pin(dapm, "MICBIAS");

	snd_soc_dapm_enable_pin(dapm, "SAR");

	snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");

	snd_soc_dapm_force_enable_pin(dapm, "SAR");

	snd_soc_dapm_sync(dapm);



	msleep(100);