Commit 1a6958e7 authored by Axel Lin's avatar Axel Lin Committed by Liam Girdwood

regulator: Fix memory leak in set_machine_constraints() error paths

Properly kfree rdev->constraints in all set_machine_constraints() error paths.
Also properly kfree rdev->constraints in regulator_register() error paths.
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 89f425ed
...@@ -794,7 +794,6 @@ static int machine_constraints_voltage(struct regulator_dev *rdev, ...@@ -794,7 +794,6 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to apply %duV constraint\n", rdev_err(rdev, "failed to apply %duV constraint\n",
rdev->constraints->min_uV); rdev->constraints->min_uV);
rdev->constraints = NULL;
return ret; return ret;
} }
} }
...@@ -897,7 +896,6 @@ static int set_machine_constraints(struct regulator_dev *rdev, ...@@ -897,7 +896,6 @@ static int set_machine_constraints(struct regulator_dev *rdev,
ret = suspend_prepare(rdev, rdev->constraints->initial_state); ret = suspend_prepare(rdev, rdev->constraints->initial_state);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to set suspend state\n"); rdev_err(rdev, "failed to set suspend state\n");
rdev->constraints = NULL;
goto out; goto out;
} }
} }
...@@ -924,13 +922,15 @@ static int set_machine_constraints(struct regulator_dev *rdev, ...@@ -924,13 +922,15 @@ static int set_machine_constraints(struct regulator_dev *rdev,
ret = ops->enable(rdev); ret = ops->enable(rdev);
if (ret < 0) { if (ret < 0) {
rdev_err(rdev, "failed to enable\n"); rdev_err(rdev, "failed to enable\n");
rdev->constraints = NULL;
goto out; goto out;
} }
} }
print_constraints(rdev); print_constraints(rdev);
return 0;
out: out:
kfree(rdev->constraints);
rdev->constraints = NULL;
return ret; return ret;
} }
...@@ -2701,6 +2701,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, ...@@ -2701,6 +2701,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
unset_regulator_supplies(rdev); unset_regulator_supplies(rdev);
scrub: scrub:
kfree(rdev->constraints);
device_unregister(&rdev->dev); device_unregister(&rdev->dev);
/* device core frees rdev */ /* device core frees rdev */
rdev = ERR_PTR(ret); rdev = ERR_PTR(ret);
......
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