Merge remote-tracking branch 'asoc/fix/wm8731' into asoc-linus

Mark Brown
2 parents 125e7f1f02 8a6cf30bf9
Showing 1 changed file Side-by-side Diff
sound/soc/codecs/wm8731.c
@@ -717,6 +717,8 @@
 	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);
...	...	@@ -717,6 +717,8 @@
717	717	if (wm8731 == NULL)
718	718	return -ENOMEM;
719	719
	720	+ mutex_init(&wm8731->lock);
	721	+
720	722	wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
721	723	if (IS_ERR(wm8731->regmap)) {
722	724	ret = PTR_ERR(wm8731->regmap);