diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-09 11:00:59 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-10 14:07:57 -0500 |
commit | d74bcaaeb66826192c9e361cbfe8fd1ffaccf74e (patch) | |
tree | 4ac29253fb66ed5644b57e65e7b1ae16c6ca3288 /sound/soc/codecs/arizona.c | |
parent | 210a5fae55c05174b8a5b571b6698626b3ae35d3 (diff) |
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, | |||
1164 | { 0x80, 0x0 }, | 1164 | { 0x80, 0x0 }, |
1165 | }; | 1165 | }; |
1166 | 1166 | ||
1167 | mutex_lock(&codec->mutex); | 1167 | mutex_lock(&arizona->dac_comp_lock); |
1168 | 1168 | ||
1169 | dac_comp[1].def = arizona->dac_comp_coeff; | 1169 | dac_comp[1].def = arizona->dac_comp_coeff; |
1170 | if (rate >= 176400) | 1170 | if (rate >= 176400) |
1171 | dac_comp[2].def = arizona->dac_comp_enabled; | 1171 | dac_comp[2].def = arizona->dac_comp_enabled; |
1172 | 1172 | ||
1173 | mutex_unlock(&codec->mutex); | 1173 | mutex_unlock(&arizona->dac_comp_lock); |
1174 | 1174 | ||
1175 | regmap_multi_reg_write(arizona->regmap, | 1175 | regmap_multi_reg_write(arizona->regmap, |
1176 | dac_comp, | 1176 | dac_comp, |