Skip to content

Commit

Permalink
ASoC: ml26124: Convert to devm_regmap_init_i2c
Browse files Browse the repository at this point in the history
This fixes a leak if snd_soc_register_codec fails.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jun 13, 2012
1 parent 85f2439 commit 8994a5e
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions sound/soc/codecs/ml26124.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c,

i2c_set_clientdata(i2c, priv);

priv->regmap = regmap_init_i2c(i2c, &ml26124_i2c_regmap);
priv->regmap = devm_regmap_init_i2c(i2c, &ml26124_i2c_regmap);
if (IS_ERR(priv->regmap)) {
ret = PTR_ERR(priv->regmap);
dev_err(&i2c->dev, "regmap_init_i2c() failed: %d\n", ret);
Expand All @@ -651,10 +651,7 @@ static __devinit int ml26124_i2c_probe(struct i2c_client *i2c,

static __devexit int ml26124_i2c_remove(struct i2c_client *client)
{
struct ml26124_priv *priv = i2c_get_clientdata(client);

snd_soc_unregister_codec(&client->dev);
regmap_exit(priv->regmap);
return 0;
}

Expand Down

0 comments on commit 8994a5e

Please sign in to comment.