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

ASoC: Convert max9850 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-29 12:03:16 +08:00 committed by Mark Brown
parent b1b548824b
commit bf791bdb38
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/max9850.c
View File

@ -335,7 +335,8 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
struct max9850_priv *max9850; struct max9850_priv *max9850;
int ret; int ret;
max9850 = kzalloc(sizeof(struct max9850_priv), GFP_KERNEL); max9850 = devm_kzalloc(&i2c->dev, sizeof(struct max9850_priv),
GFP_KERNEL);
if (max9850 == NULL) if (max9850 == NULL)
return -ENOMEM; return -ENOMEM;
@ -343,15 +344,12 @@ static int __devinit max9850_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_max9850, &max9850_dai, 1); &soc_codec_dev_max9850, &max9850_dai, 1);
if (ret < 0)
kfree(max9850);
return ret; return ret;
} }
static __devexit int max9850_i2c_remove(struct i2c_client *client) static __devexit int max9850_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;
} }