summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps6507x-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-01-27 13:54:40 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-30 11:44:41 +0100
commit0ce7d00d0d7bc04d917b8775da177dde962ce17e (patch)
tree14add8968867ea2574a55f0e8bdec8b12e38e7f2 /drivers/regulator/tps6507x-regulator.c
parentregulator: tps6507x: add device tree support. (diff)
downloadlinux-0ce7d00d0d7bc04d917b8775da177dde962ce17e.tar.xz
linux-0ce7d00d0d7bc04d917b8775da177dde962ce17e.zip
regulator: tps6507x: Fix using wrong dev argument for calling of_regulator_match
The dev parameter is the device requesting the data. In this case it should be &pdev->dev rather than pdev->dev.parent. The dev parameter is used to call devm_kzalloc in of_get_regulator_init_data(), which means this fixes a memory leak because the memory is allocated every time probe() is called, thus it should be freed when this driver is unloaded. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/tps6507x-regulator.c')
-rw-r--r--drivers/regulator/tps6507x-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index afdeb65b6a4d..54aa2da7283b 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -394,7 +394,7 @@ static struct tps6507x_board *tps6507x_parse_dt_reg_data(
count = ARRAY_SIZE(tps6507x_matches);
matches = tps6507x_matches;
- ret = of_regulator_match(pdev->dev.parent, regulators, matches, count);
+ ret = of_regulator_match(&pdev->dev, regulators, matches, count);
if (ret < 0) {
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
ret);