diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 15:22:28 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 15:22:28 (GMT) |
| commit | 59b4cd42f2c96f5c9bf3947f28e3d2ac0148fbcc (patch) | |
| tree | 6d52b9832a0e9caefa5020f640c3a3b3d0474dd3 /sound/soc | |
| parent | 753ad46e868e50ac34af514948fe227e87896d1e (diff) | |
| parent | fd64c455601ff20a83c52892d1bc8343bec0b6b7 (diff) | |
| download | linux-59b4cd42f2c96f5c9bf3947f28e3d2ac0148fbcc.tar.xz | |
Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8741.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 4281a08..99b8ebe 100644 --- a/sound/soc/codecs/wm8741.c +++ b/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); |