Commit e2257db3 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Convert tlv320aic3x to devm_kzalloc()

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a8163023
...@@ -1504,7 +1504,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, ...@@ -1504,7 +1504,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
struct aic3x_priv *aic3x; struct aic3x_priv *aic3x;
int ret; int ret;
aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL); aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
if (aic3x == NULL) { if (aic3x == NULL) {
dev_err(&i2c->dev, "failed to create private data\n"); dev_err(&i2c->dev, "failed to create private data\n");
return -ENOMEM; return -ENOMEM;
...@@ -1524,15 +1524,12 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, ...@@ -1524,15 +1524,12 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_aic3x, &aic3x_dai, 1); &soc_codec_dev_aic3x, &aic3x_dai, 1);
if (ret < 0)
kfree(aic3x);
return ret; return ret;
} }
static int aic3x_i2c_remove(struct i2c_client *client) static int aic3x_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0; return 0;
} }
......
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