Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d1cc0ec3da23e44c23712579515494b374f111c9

Authored by Johan Hovold
Committed by Lee Jones
1 parent 4a9c8bb2ac

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>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

drivers/video/backlight/max8925_bl.c
Diff comments   View file @ d1cc0ec
... ... @@ -116,7 +116,7 @@
116 116 if (!pdata)
117 117 return;
118 118  
119   - np = of_find_node_by_name(nproot, "backlight");
  119 + np = of_get_child_by_name(nproot, "backlight");
120 120 if (!np) {
121 121 dev_err(&pdev->dev, "failed to find backlight node\n");
122 122 return;
... ... @@ -124,6 +124,8 @@
124 124  
125 125 if (!of_property_read_u32(np, "maxim,max8925-dual-string", &val))
126 126 pdata->dual_string = val;
  127 +
  128 + of_node_put(np);
127 129  
128 130 pdev->dev.platform_data = pdata;
129 131 }