diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-09 17:00:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-10 20:07:57 +0100 |
| commit | d74bcaaeb66826192c9e361cbfe8fd1ffaccf74e (patch) | |
| tree | 4ac29253fb66ed5644b57e65e7b1ae16c6ca3288 /sound/soc/codecs/arizona.c | |
| parent | ASoC: max98095: Move mutex to the driver level (diff) | |
| download | linux-d74bcaaeb66826192c9e361cbfe8fd1ffaccf74e.tar.xz linux-d74bcaaeb66826192c9e361cbfe8fd1ffaccf74e.zip | |
ASoC: wm5102: Move ultrasonic response settings lock to the driver level
The wm5102 driver currently uses the snd_soc_codec mutex to protect its
ultrasonic response settings from concurrent access. This patch moves this
lock to the driver level. This will allow us to eventually remove the
snd_soc_codec mutex.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 0c05e7a7945f..730636c14f2e 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1164,13 +1164,13 @@ static void arizona_wm5102_set_dac_comp(struct snd_soc_codec *codec, { 0x80, 0x0 }, }; - mutex_lock(&codec->mutex); + mutex_lock(&arizona->dac_comp_lock); dac_comp[1].def = arizona->dac_comp_coeff; if (rate >= 176400) dac_comp[2].def = arizona->dac_comp_enabled; - mutex_unlock(&codec->mutex); + mutex_unlock(&arizona->dac_comp_lock); regmap_multi_reg_write(arizona->regmap, dac_comp, |