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

This commit is contained in:
Mark Brown 2012-12-10 00:22:32 +09:00
commit e7d28c8ca4

View file

@ -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);