summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:32 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:32 +0900
commite7d28c8ca476beed80a299d3587afa5448edb356 (patch)
tree328ab006d39999cc1c9da2ce021902fda5bd942a /sound
parent7a7f9875d9d35315c22830be5ce7fdd80b1d1ab0 (diff)
parentc5e6f5fa0ad8e0d66cdb459a6193afc4f0ee8387 (diff)
downloadlinux-e7d28c8ca476beed80a299d3587afa5448edb356.tar.bz2
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8960.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index f0f6f6601785..cf09cb625a7b 100644
--- 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);