summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-09-16 18:10:41 +0200
committerSebastian Reichel <sre@kernel.org>2014-09-25 01:37:13 +0200
commitddd26dff757d08d4eb309a28bf2a02372387e71f (patch)
treecf71e5e91aa7cb2df77c2c323ff7c34c5dbeec60 /drivers/power
parentpower: max8925: Fix NULL ptr dereference on memory allocation failure (diff)
downloadlinux-ddd26dff757d08d4eb309a28bf2a02372387e71f.tar.xz
linux-ddd26dff757d08d4eb309a28bf2a02372387e71f.zip
power: max8925: Use of_get_child_by_name
Use of_get_child_by_name to obtain reference to charger node instead of of_find_node_by_name which can walk outside of the parent node. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/max8925_power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index 0cf237808d47..a6d45eef64dd 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -443,7 +443,7 @@ max8925_power_dt_init(struct platform_device *pdev)
if (!nproot)
return pdev->dev.platform_data;
- np = of_find_node_by_name(nproot, "charger");
+ np = of_get_child_by_name(nproot, "charger");
if (!np) {
dev_err(&pdev->dev, "failed to find charger node\n");
return NULL;