From fd5c1c7d7fc4c066508bcecfc53484948d54d205 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 10 Dec 2012 00:22:28 +0900 Subject: [PATCH] --- yaml --- r: 342947 b: refs/heads/master c: 59b4cd42f2c96f5c9bf3947f28e3d2ac0148fbcc h: refs/heads/master i: 342945: 42e3a544514c6ee2243a4a087b04f8176e702577 342943: 56b989ee8bba3efab327a9f8c728b149e7e89e5a v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8741.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 927e5e14958f..68f9742ca870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 753ad46e868e50ac34af514948fe227e87896d1e +refs/heads/master: 59b4cd42f2c96f5c9bf3947f28e3d2ac0148fbcc diff --git a/trunk/sound/soc/codecs/wm8741.c b/trunk/sound/soc/codecs/wm8741.c index 4281a0802138..99b8ebe93424 100644 --- a/trunk/sound/soc/codecs/wm8741.c +++ b/trunk/sound/soc/codecs/wm8741.c @@ -522,7 +522,7 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, return ret; } - wm8741->regmap = regmap_init_i2c(i2c, &wm8741_regmap); + wm8741->regmap = devm_regmap_init_i2c(i2c, &wm8741_regmap); if (IS_ERR(wm8741->regmap)) { ret = PTR_ERR(wm8741->regmap); dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret); @@ -582,7 +582,7 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi) return ret; } - wm8741->regmap = regmap_init_spi(spi, &wm8741_regmap); + wm8741->regmap = devm_regmap_init_spi(spi, &wm8741_regmap); if (IS_ERR(wm8741->regmap)) { ret = PTR_ERR(wm8741->regmap); dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);