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

ASoC: Convert WM2000 to devm_kzalloc()

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-02 21:28:31 +00:00
parent 6cd4eb9592
commit b03e96e4d6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/codecs/wm2000.c
View file

@ -740,7 +740,8 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
return -EINVAL; return -EINVAL;
} }
wm2000 = kzalloc(sizeof(struct wm2000_priv), GFP_KERNEL); wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),
GFP_KERNEL);
if (wm2000 == NULL) { if (wm2000 == NULL) {
dev_err(&i2c->dev, "Unable to allocate private data\n"); dev_err(&i2c->dev, "Unable to allocate private data\n");
return -ENOMEM; return -ENOMEM;
@ -779,7 +780,9 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
/* Pre-cook the concatenation of the register address onto the image */ /* Pre-cook the concatenation of the register address onto the image */
wm2000->anc_download_size = fw->size + 2; wm2000->anc_download_size = fw->size + 2;
wm2000->anc_download = kmalloc(wm2000->anc_download_size, GFP_KERNEL); wm2000->anc_download = devm_kzalloc(&i2c->dev,
wm2000->anc_download_size,
GFP_KERNEL);
if (wm2000->anc_download == NULL) { if (wm2000->anc_download == NULL) {
dev_err(&i2c->dev, "Out of memory\n"); dev_err(&i2c->dev, "Out of memory\n");
ret = -ENOMEM; ret = -ENOMEM;
@ -810,7 +813,6 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
err_fw: err_fw:
release_firmware(fw); release_firmware(fw);
err: err:
kfree(wm2000);
return ret; return ret;
} }
@ -821,8 +823,6 @@ static __devexit int wm2000_i2c_remove(struct i2c_client *i2c)
wm2000_anc_transition(wm2000, ANC_OFF); wm2000_anc_transition(wm2000, ANC_OFF);
wm2000_i2c = NULL; wm2000_i2c = NULL;
kfree(wm2000->anc_download);
kfree(wm2000);
return 0; return 0;
} }