UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Convert rt5631 to devm_kzalloc() 

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:04:15 +08:00 committed by Mark Brown
parent bf791bdb38
commit a92b0a0803
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/rt5631.c
View File

@ -1724,7 +1724,8 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
struct rt5631_priv *rt5631; struct rt5631_priv *rt5631;
int ret; int ret;
rt5631 = kzalloc(sizeof(struct rt5631_priv), GFP_KERNEL); rt5631 = devm_kzalloc(&i2c->dev, sizeof(struct rt5631_priv),
GFP_KERNEL);
if (NULL == rt5631) if (NULL == rt5631)
return -ENOMEM; return -ENOMEM;
@ -1732,16 +1733,12 @@ static int rt5631_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631, ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5631,
rt5631_dai, ARRAY_SIZE(rt5631_dai)); rt5631_dai, ARRAY_SIZE(rt5631_dai));
if (ret < 0)
kfree(rt5631);
return ret; return ret;
} }
static __devexit int rt5631_i2c_remove(struct i2c_client *client) static __devexit int rt5631_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;
} }