diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-09-29 22:15:12 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-30 14:25:55 +0200 |
| commit | 42871e95a3afea8956d8cc567ea725b33a837775 (patch) | |
| tree | 6375a3a1b1ce1ea22accf21077ecf3ee0499d2ce /sound/soc/codecs/nau8824.c | |
| parent | ASoC: cs4341: Add SPI device ID table (diff) | |
| download | linux-42871e95a3afea8956d8cc567ea725b33a837775.tar.xz linux-42871e95a3afea8956d8cc567ea725b33a837775.zip | |
ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
Commit 1d25684e2251 ("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: 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210929201512.460360-1-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/nau8824.c')
| -rw-r--r-- | sound/soc/codecs/nau8824.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c index db88be48c998..f946ef65a4c1 100644 --- a/sound/soc/codecs/nau8824.c +++ b/sound/soc/codecs/nau8824.c @@ -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); |