Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: Convert WM8960 to devm_kzalloc()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-16 07:42:58 +01:00
parent 1eb0202dc7
commit b9791c0109
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/wm8960.c
View File

@ -973,7 +973,8 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
struct wm8960_priv *wm8960;
int ret;
wm8960 = kzalloc(sizeof(struct wm8960_priv), GFP_KERNEL);
wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv),
GFP_KERNEL);
if (wm8960 == NULL)
return -ENOMEM;
@ -982,15 +983,13 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8960, &wm8960_dai, 1);
if (ret < 0)
kfree(wm8960);
return ret;
}
static __devexit int wm8960_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0;
}