Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/wm8731' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Feb 5, 2015
2 parents 125e7f1 + 8a6cf30 commit b2dde2f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sound/soc/codecs/wm8731.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b2dde2f

Please sign in to comment.