leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Convert da7210 to devm_kzalloc()

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-12-26 20:54:04 +08:00 committed by Mark Brown
parent 2c9d9b6fa7
commit 306bf6b19e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/da7210.c
View File

@ -944,7 +944,8 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
struct da7210_priv *da7210; struct da7210_priv *da7210;
int ret; int ret;
da7210 = kzalloc(sizeof(struct da7210_priv), GFP_KERNEL); da7210 = devm_kzalloc(&i2c->dev, sizeof(struct da7210_priv),
GFP_KERNEL);
if (!da7210) if (!da7210)
return -ENOMEM; return -ENOMEM;
@ -953,16 +954,12 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_da7210, &da7210_dai, 1); &soc_codec_dev_da7210, &da7210_dai, 1);
if (ret < 0)
kfree(da7210);
return ret; return ret;
} }
static int __devexit da7210_i2c_remove(struct i2c_client *client) static int __devexit da7210_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;
} }