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

ASoC: Convert wm8904 to devm_kzalloc()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-29 20:05:00 +00:00
parent 429440c947
commit 93e26d4e44
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/wm8904.c
View File

@ -2531,7 +2531,8 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
struct wm8904_priv *wm8904; struct wm8904_priv *wm8904;
int ret; int ret;
wm8904 = kzalloc(sizeof(struct wm8904_priv), GFP_KERNEL); wm8904 = devm_kzalloc(&i2c->dev, sizeof(struct wm8904_priv),
GFP_KERNEL);
if (wm8904 == NULL) if (wm8904 == NULL)
return -ENOMEM; return -ENOMEM;
@ -2541,15 +2542,13 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8904, &wm8904_dai, 1); &soc_codec_dev_wm8904, &wm8904_dai, 1);
if (ret < 0)
kfree(wm8904);
return ret; return ret;
} }
static __devexit int wm8904_i2c_remove(struct i2c_client *client) static __devexit int wm8904_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;
} }