diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-09 17:01:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-10 19:08:22 +0000 |
| commit | fabfad2f8b23529722c6ef5b3537c457e63d2c82 (patch) | |
| tree | 7328cbf46314fff70aacfe9089c3b74ee6285cd4 /sound/soc/codecs/wm8994.h | |
| parent | 78660af7ba30e9d2cc9614465c8b65b3c85f49a9 (diff) | |
| download | blackbird-op-linux-fabfad2f8b23529722c6ef5b3537c457e63d2c82.tar.gz blackbird-op-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.h')
| -rw-r--r-- | sound/soc/codecs/wm8994.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index 6536f8d45ac6..dd73387b1cc4 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -13,6 +13,7 @@ #include <linux/firmware.h> #include <linux/completion.h> #include <linux/workqueue.h> +#include <linux/mutex.h> #include "wm_hubs.h" @@ -156,6 +157,7 @@ struct wm8994_priv { unsigned int aif1clk_disable:1; unsigned int aif2clk_disable:1; + struct mutex fw_lock; int dsp_active; const struct firmware *cur_fw; const struct firmware *mbc; |
