diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 15:22:13 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 15:22:13 (GMT) |
| commit | edbe08adea97cda5ac79b26b01d80ec8cf2154b7 (patch) | |
| tree | e7036ee9466250c4b00ce79fb633d07a7da2919d | |
| parent | 9a6806c0a7efd021dacfb7cd8bdfd11c2c6e860d (diff) | |
| parent | 2fadf6a861587ec554c4a73222d31e12003176a8 (diff) | |
| download | linux-edbe08adea97cda5ac79b26b01d80ec8cf2154b7.tar.xz | |
Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-next
| -rw-r--r-- | sound/soc/codecs/lm49453.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index 99b0a9d..096b6aa 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c @@ -1497,7 +1497,7 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, lm49453); - lm49453->regmap = regmap_init_i2c(i2c, &lm49453_regmap_config); + lm49453->regmap = devm_regmap_init_i2c(i2c, &lm49453_regmap_config); if (IS_ERR(lm49453->regmap)) { ret = PTR_ERR(lm49453->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", @@ -1508,21 +1508,15 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_lm49453, lm49453_dai, ARRAY_SIZE(lm49453_dai)); - if (ret < 0) { + if (ret < 0) dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); - regmap_exit(lm49453->regmap); - return ret; - } return ret; } static int __devexit lm49453_i2c_remove(struct i2c_client *client) { - struct lm49453_priv *lm49453 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - regmap_exit(lm49453->regmap); return 0; } |