diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-18 10:34:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-18 10:34:54 -0700 |
| commit | bd26a74e932a8b64e16fdc27ac29d8287a8fdd6e (patch) | |
| tree | 9b29d785e8f7bf73a3d85bab7aa7941bc2fa5b1c /drivers/regulator/max8925-regulator.c | |
| parent | 27180f7de7ce16aecfc75c92942cb42f4053df72 (diff) | |
| parent | b8b27a44ddf1987e9bae84b99741b0a61192e017 (diff) | |
| download | op-kernel-dev-bd26a74e932a8b64e16fdc27ac29d8287a8fdd6e.zip op-kernel-dev-bd26a74e932a8b64e16fdc27ac29d8287a8fdd6e.tar.gz | |
Merge tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"Fix some leaked OF node references in regulator drivers that have been
left over following a fix on a fix to the reference counting"
* tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: remove unnecessary of_node_get() to parent
Diffstat (limited to 'drivers/regulator/max8925-regulator.c')
| -rw-r--r-- | drivers/regulator/max8925-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index dad2bcd..7770777 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c @@ -250,7 +250,7 @@ static int max8925_regulator_dt_init(struct platform_device *pdev, struct device_node *nproot, *np; int rcount; - nproot = of_node_get(pdev->dev.parent->of_node); + nproot = pdev->dev.parent->of_node; if (!nproot) return -ENODEV; np = of_get_child_by_name(nproot, "regulators"); |
