summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-01-30 20:28:20 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-31 14:42:05 +0800
commit09a228e70b04cdb514e9ec7f0a600b0b10dca1ca (patch)
tree65b465f4e1ee58a67d6e50115add2228c3390bda
parent6c7a7a0e36d1c122960cee5c5fd56f289a21cf1b (diff)
downloadlinux-3.10-09a228e70b04cdb514e9ec7f0a600b0b10dca1ca.tar.gz
linux-3.10-09a228e70b04cdb514e9ec7f0a600b0b10dca1ca.tar.bz2
linux-3.10-09a228e70b04cdb514e9ec7f0a600b0b10dca1ca.zip
regulator: tps65090: 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>
-rw-r--r--drivers/regulator/tps65090-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index 8687543abe2..c8e70451df3 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -186,7 +186,7 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data(
return ERR_PTR(-ENODEV);
}
- ret = of_regulator_match(pdev->dev.parent, regulators, tps65090_matches,
+ ret = of_regulator_match(&pdev->dev, regulators, tps65090_matches,
ARRAY_SIZE(tps65090_matches));
if (ret < 0) {
dev_err(&pdev->dev,