diff options
author | Mark Brown <broonie@kernel.org> | 2019-11-06 19:29:34 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-11-06 19:29:34 +0300 |
commit | 992fd39a349ac62044d9e20d17d309c2cf0f5c27 (patch) | |
tree | 57bfb35f9faf3c13e8cec23ef00ac23206b7da52 /sound/soc/rockchip/rockchip_max98090.c | |
parent | 18dd66ea84464a4bc86089276d5f75cadeb94a09 (diff) | |
parent | 9508ef5a980f5d847cad9b932b6ada8f2a3466c1 (diff) | |
download | linux-992fd39a349ac62044d9e20d17d309c2cf0f5c27.tar.xz |
Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.5
Diffstat (limited to 'sound/soc/rockchip/rockchip_max98090.c')
-rw-r--r-- | sound/soc/rockchip/rockchip_max98090.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 5c2504a465f4..60930fa85aa4 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -113,10 +113,13 @@ static int rk_jack_event(struct notifier_block *nb, unsigned long event, struct snd_soc_jack *jack = (struct snd_soc_jack *)data; struct snd_soc_dapm_context *dapm = &jack->card->dapm; - if (event & SND_JACK_MICROPHONE) + if (event & SND_JACK_MICROPHONE) { snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); - else + snd_soc_dapm_force_enable_pin(dapm, "SHDN"); + } else { snd_soc_dapm_disable_pin(dapm, "MICBIAS"); + snd_soc_dapm_disable_pin(dapm, "SHDN"); + } snd_soc_dapm_sync(dapm); |