forked from Minki/linux
ASoC: Convert tpa6130a2 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
a54877d745
commit
6945e9f9df
@ -376,7 +376,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
data = kzalloc(sizeof(*data), GFP_KERNEL);
|
||||
data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
|
||||
if (data == NULL) {
|
||||
dev_err(dev, "Can not allocate memory\n");
|
||||
return -ENOMEM;
|
||||
@ -450,7 +450,6 @@ err_regulator:
|
||||
if (data->power_gpio >= 0)
|
||||
gpio_free(data->power_gpio);
|
||||
err_gpio:
|
||||
kfree(data);
|
||||
tpa6130a2_client = NULL;
|
||||
|
||||
return ret;
|
||||
@ -466,8 +465,6 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client)
|
||||
gpio_free(data->power_gpio);
|
||||
|
||||
regulator_put(data->supply);
|
||||
|
||||
kfree(data);
|
||||
tpa6130a2_client = NULL;
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user