Commit 085efd28 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: da7210: fix a memory leak if failed to initialise da7210 audio codec

da7210 should be kfreed if da7210_init() return error.
This patch also fixes the error handing in the case of snd_soc_register_dai()
fail by adding snd_soc_unregister_codec() in error path.
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7bcaad91
...@@ -499,7 +499,7 @@ static int da7210_init(struct da7210_priv *da7210) ...@@ -499,7 +499,7 @@ static int da7210_init(struct da7210_priv *da7210)
ret = snd_soc_register_dai(&da7210_dai); ret = snd_soc_register_dai(&da7210_dai);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to register DAI: %d\n", ret); dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
goto init_err; goto codec_err;
} }
/* FIXME /* FIXME
...@@ -585,6 +585,8 @@ static int da7210_init(struct da7210_priv *da7210) ...@@ -585,6 +585,8 @@ static int da7210_init(struct da7210_priv *da7210)
return ret; return ret;
codec_err:
snd_soc_unregister_codec(codec);
init_err: init_err:
kfree(codec->reg_cache); kfree(codec->reg_cache);
codec->reg_cache = NULL; codec->reg_cache = NULL;
...@@ -612,8 +614,10 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, ...@@ -612,8 +614,10 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
codec->control_data = i2c; codec->control_data = i2c;
ret = da7210_init(da7210); ret = da7210_init(da7210);
if (ret < 0) if (ret < 0) {
pr_err("Failed to initialise da7210 audio codec\n"); pr_err("Failed to initialise da7210 audio codec\n");
kfree(da7210);
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment