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

ASoC: Convert max98088 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:01:07 +08:00 committed by Mark Brown
parent 021b918efb
commit 49ba767324
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/max98088.c
View File

@ -2069,7 +2069,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
struct max98088_priv *max98088; struct max98088_priv *max98088;
int ret; int ret;
max98088 = kzalloc(sizeof(struct max98088_priv), GFP_KERNEL); max98088 = devm_kzalloc(&i2c->dev, sizeof(struct max98088_priv),
GFP_KERNEL);
if (max98088 == NULL) if (max98088 == NULL)
return -ENOMEM; return -ENOMEM;
@ -2080,15 +2081,12 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_max98088, &max98088_dai[0], 2); &soc_codec_dev_max98088, &max98088_dai[0], 2);
if (ret < 0)
kfree(max98088);
return ret; return ret;
} }
static int __devexit max98088_i2c_remove(struct i2c_client *client) static int __devexit max98088_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;
} }