From cc6bed1d77e1303ef1b8931cbe441cfca40bcaf5 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Dec 2012 00:22:32 +0900
Subject: [PATCH] --- yaml --- r: 342953 b: refs/heads/master c:
 e7d28c8ca476beed80a299d3587afa5448edb356 h: refs/heads/master i:   342951:
 44d702303b7ee444a94c7fda723e7655c7bb0479 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8960.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae6e5a6a2228..63318c7fcc02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a7f9875d9d35315c22830be5ce7fdd80b1d1ab0
+refs/heads/master: e7d28c8ca476beed80a299d3587afa5448edb356
diff --git a/trunk/sound/soc/codecs/wm8960.c b/trunk/sound/soc/codecs/wm8960.c
index f0f6f6601785..cf09cb625a7b 100644
--- a/trunk/sound/soc/codecs/wm8960.c
+++ b/trunk/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);