diff options
author | Mark Brown <broonie@kernel.org> | 2021-10-18 22:15:13 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-10-18 22:15:13 +0200 |
commit | bfceb9c2160109ef8c9305e0a726c7fe6cd9cd9e (patch) | |
tree | 5589e266f667dd091405452a03dcb242cbac456f /sound/soc/codecs/nau8824.c | |
parent | Merge series "ASoC: cleanup / tidyup soc-pcm/core/component" from Kuninori Mo... (diff) | |
parent | ASoC: cs42l42: Always enable TS_PLUG and TS_UNPLUG interrupts (diff) | |
download | linux-bfceb9c2160109ef8c9305e0a726c7fe6cd9cd9e.tar.xz linux-bfceb9c2160109ef8c9305e0a726c7fe6cd9cd9e.zip |
Merge branch 'asoc-5.15' into asoc-5.16
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 ffb3881aa40f..d0dd1542f78a 100644 --- a/sound/soc/codecs/nau8824.c +++ b/sound/soc/codecs/nau8824.c @@ -875,8 +875,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); |