aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-11-20 05:45:45 -0500
committerLee Jones <lee.jones@linaro.org>2018-06-11 08:40:32 -0400
commitd1cc0ec3da23e44c23712579515494b374f111c9 (patch)
treedea7ef35ebd0179b77600409c63eb332b4eaf128
parent4a9c8bb2aca5b5a2a15744333729745dd9903562 (diff)
backlight: max8925_bl: Fix Device Tree node lookup
Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent mfd node was also prematurely freed, while the child backlight node was leaked. Cc: stable <stable@vger.kernel.org> # 3.9 Fixes: 47ec340cb8e2 ("mfd: max8925: Support dt for backlight") Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Daniel Thompson <daniel.thompson@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/video/backlight/max8925_bl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 7b738d60ecc2..f3aa6088f1d9 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -116,7 +116,7 @@ static void max8925_backlight_dt_init(struct platform_device *pdev)
116 if (!pdata) 116 if (!pdata)
117 return; 117 return;
118 118
119 np = of_find_node_by_name(nproot, "backlight"); 119 np = of_get_child_by_name(nproot, "backlight");
120 if (!np) { 120 if (!np) {
121 dev_err(&pdev->dev, "failed to find backlight node\n"); 121 dev_err(&pdev->dev, "failed to find backlight node\n");
122 return; 122 return;
@@ -125,6 +125,8 @@ static void max8925_backlight_dt_init(struct platform_device *pdev)
125 if (!of_property_read_u32(np, "maxim,max8925-dual-string", &val)) 125 if (!of_property_read_u32(np, "maxim,max8925-dual-string", &val))
126 pdata->dual_string = val; 126 pdata->dual_string = val;
127 127
128 of_node_put(np);
129
128 pdev->dev.platform_data = pdata; 130 pdev->dev.platform_data = pdata;
129} 131}
130 132