summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-05 19:34:53 +0000
committerMark Brown <broonie@kernel.org>2015-02-05 19:34:53 +0000
commitb2dde2f975a7850b696c21253864fd93c1753e7c (patch)
treef57f23c1e985a51c5ebc2597c0de5a8be36b6f97 /sound/soc/codecs
parent125e7f1f02a610411d097b44f0058f8c6415301e (diff)
parent8a6cf30bf93df2c0f2637156e4a5070594bddebf (diff)
downloadkernel-b2dde2f975a7850b696c21253864fd93c1753e7c.tar.gz
Merge remote-tracking branch 'asoc/fix/wm8731' into asoc-linus
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8731.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index b9211b42f6e9..b115ed815db9 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -717,6 +717,8 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
if (wm8731 == NULL)
return -ENOMEM;
+ mutex_init(&wm8731->lock);
+
wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
if (IS_ERR(wm8731->regmap)) {
ret = PTR_ERR(wm8731->regmap);