summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps65217-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-01-24 10:27:30 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-24 18:58:33 +0800
commit5bce833c44d53ef5a31b844cf7678ddaeb406624 (patch)
tree42d8cb7d2592b55141f587c3477ea03e833dea12 /drivers/regulator/tps65217-regulator.c
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff)
downloadtalos-obmc-linux-5bce833c44d53ef5a31b844cf7678ddaeb406624.tar.gz
talos-obmc-linux-5bce833c44d53ef5a31b844cf7678ddaeb406624.zip
regulator: tps65217: Fix using wrong dev argument for calling of_regulator_match
The dev parameter is the device requestiong 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/tps65217-regulator.c')
-rw-r--r--drivers/regulator/tps65217-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c
index 73dce7664126..df395187c063 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -305,8 +305,8 @@ static struct tps65217_board *tps65217_parse_dt(struct platform_device *pdev)
if (!regs)
return NULL;
- count = of_regulator_match(pdev->dev.parent, regs,
- reg_matches, TPS65217_NUM_REGULATOR);
+ count = of_regulator_match(&pdev->dev, regs, reg_matches,
+ TPS65217_NUM_REGULATOR);
of_node_put(regs);
if ((count < 0) || (count > TPS65217_NUM_REGULATOR))
return NULL;
OpenPOWER on IntegriCloud