diff options
| author |   Tzung-Bi Shih <tzungbi@google.com> | 2020-01-17 15:38:14 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-01-21 17:15:20 +0000 |
| commit | 294b7380ffe88d4a0626af1fee5843a3db0c913c (patch) | |
| tree | f33cf004b4f10524b397995d0e38bdab0b0ef4e7 /sound/soc/codecs/max98090.c | |
| parent | ASoC: dapm: add snd_soc_dapm_put_enum_double_locked (diff) | |
| download | linux-dev-294b7380ffe88d4a0626af1fee5843a3db0c913c.tar.xz linux-dev-294b7380ffe88d4a0626af1fee5843a3db0c913c.zip | |
ASoC: max98090: fix deadlock in max98090_dapm_put_enum_double()
Commit 62d5ae4cafb7 ("ASoC: max98090: save and restore SHDN when
changing sensitive registers SHDN bit") uses dapm_mutex to protect SHDN
bit. However, snd_soc_dapm_put_enum_double() in
max98090_dapm_put_enum_double() acquires the dapm_mutex again which
cause a deadlock.
Use snd_soc_dapm_put_enum_double_locked() instead to fix the deadlock.
Fixes: 62d5ae4cafb7 ("ASoC: max98090: save and restore SHDN when changing sensitive registers SHDN bit")
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200117073814.82441-4-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/codecs/max98090.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index c01ce4a3f86d..0313e1183167 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -88,7 +88,7 @@ static int max98090_dapm_put_enum_double(struct snd_kcontrol *kcontrol, int ret; max98090_shdn_save(max98090); - ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol); + ret = snd_soc_dapm_put_enum_double_locked(kcontrol, ucontrol); max98090_shdn_restore(max98090); return ret; |