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

git-mirror · Dec 9, 2012 · e7d28c8 · e7d28c8
2 parents 7a7f987 + c5e6f5f
commit e7d28c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
@@ -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);