evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: wm8580: Convert to devm_kzalloc()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-09-12 09:25:59 +08:00
parent 3217b0f5b6
commit 398c02f6c2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/codecs/wm8580.c
View file

@ -899,7 +899,8 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
struct wm8580_priv *wm8580; struct wm8580_priv *wm8580;
int ret; int ret;
wm8580 = kzalloc(sizeof(struct wm8580_priv), GFP_KERNEL); wm8580 = devm_kzalloc(&i2c->dev, sizeof(struct wm8580_priv),
GFP_KERNEL);
if (wm8580 == NULL) if (wm8580 == NULL)
return -ENOMEM; return -ENOMEM;
@ -908,15 +909,13 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai)); &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));
if (ret < 0)
kfree(wm8580);
return ret; return ret;
} }
static int wm8580_i2c_remove(struct i2c_client *client) static int wm8580_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;
} }