Skip to content

L
linux
Commit a290986b authored by Mark Brown's avatar Mark Brown
Browse files
Options

ASoC: Convert wm8996 to use devm_kzalloc() 

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 897f7847
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
sound/soc/codecs/wm8996.c
View file @ a290986b
...@@ -3104,7 +3104,8 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, ...@@ -3104,7 +3104,8 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,
int ret, i; int ret, i;
unsigned int reg; unsigned int reg;
wm8996 = kzalloc(sizeof(struct wm8996_priv), GFP_KERNEL); wm8996 = devm_kzalloc(&i2c->dev, sizeof(struct wm8996_priv),
GFP_KERNEL);
if (wm8996 == NULL) if (wm8996 == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -3216,7 +3217,6 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, ...@@ -3216,7 +3217,6 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,
if (wm8996->pdata.ldo_ena > 0) if (wm8996->pdata.ldo_ena > 0)
gpio_free(wm8996->pdata.ldo_ena); gpio_free(wm8996->pdata.ldo_ena);
err: err:
kfree(wm8996);
return ret; return ret;
} }
...@@ -3234,7 +3234,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client) ...@@ -3234,7 +3234,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client)
gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);
gpio_free(wm8996->pdata.ldo_ena); gpio_free(wm8996->pdata.ldo_ena);
} }
kfree(wm8996);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7