summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-09 17:01:02 +0100
committerMark Brown <broonie@kernel.org>2014-11-10 20:08:22 +0100
commitfabfad2f8b23529722c6ef5b3537c457e63d2c82 (patch)
tree7328cbf46314fff70aacfe9089c3b74ee6285cd4 /sound/soc/codecs/wm8994.c
parentASoC: wm8903: Move the deemph lock to the driver level (diff)
downloadlinux-fabfad2f8b23529722c6ef5b3537c457e63d2c82.tar.xz
linux-fabfad2f8b23529722c6ef5b3537c457e63d2c82.zip
ASoC: wm8958: Move DSP firmware lock to driver level
The wm8958 driver uses the snd_soc_codec mutex to protect the various firmware pointers from concurrent assignment. 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/wm8994.c')
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1fcb9f3f3097..dbca6e0cc93a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -4457,6 +4457,8 @@ static int wm8994_probe(struct platform_device *pdev)
return -ENOMEM;
platform_set_drvdata(pdev, wm8994);
+ mutex_init(&wm8994->fw_lock);
+
wm8994->wm8994 = dev_get_drvdata(pdev->dev.parent);
pm_runtime_enable(&pdev->dev);