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

ASoC: Convert ak4642 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-20 14:40:12 +08:00 committed by Mark Brown
parent 4273fcfd71
commit 2ff49eea9b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/ak4642.c
View File

@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
struct ak4642_priv *ak4642; struct ak4642_priv *ak4642;
int ret; int ret;
ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL); ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),
GFP_KERNEL);
if (!ak4642) if (!ak4642)
return -ENOMEM; return -ENOMEM;
@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
(struct snd_soc_codec_driver *)id->driver_data, (struct snd_soc_codec_driver *)id->driver_data,
&ak4642_dai, 1); &ak4642_dai, 1);
if (ret < 0)
kfree(ak4642);
return ret; return ret;
} }
static __devexit int ak4642_i2c_remove(struct i2c_client *client) static __devexit int ak4642_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;
} }