mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 07:00:48 +00:00
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
This commit is contained in:
commit
e7d28c8ca4
@ -1040,7 +1040,7 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
|
||||
if (wm8960 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
wm8960->regmap = regmap_init_i2c(i2c, &wm8960_regmap);
|
||||
wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap);
|
||||
if (IS_ERR(wm8960->regmap))
|
||||
return PTR_ERR(wm8960->regmap);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user