mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ASoC: ml26124: Convert to devm_regmap_init_i2c
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>
This commit is contained in:
parent
85f243912b
commit
8994a5e1d2
1 changed files with 1 additions and 4 deletions
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue