Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a275ddf7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next

parents f5a1345b c5e6f5fa

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -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);