Skip to content

Commit

Permalink
mfd: twl6040: Fix child-node lookup
Browse files Browse the repository at this point in the history
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 node was prematurely freed, while the
child node was leaked.

Note that the CONFIG_OF compile guard can be removed as
of_get_child_by_name() provides a !CONFIG_OF implementation which always
fails.

Cc: stable <stable@vger.kernel.org>     # 3.5
Fixes: 37e13ce ("mfd: Add support for Device Tree to twl6040")
Fixes: ca2cad6 ("mfd: Fix twl6040 build failure")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Johan Hovold authored and Lee Jones committed Nov 29, 2017
1 parent 0a42377 commit 85e9b13
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/mfd/twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,16 @@ static struct reg_sequence twl6040_patch[] = {
};


static bool twl6040_has_vibra(struct device_node *node)
static bool twl6040_has_vibra(struct device_node *parent)
{
#ifdef CONFIG_OF
if (of_find_node_by_name(node, "vibra"))
struct device_node *node;

node = of_get_child_by_name(parent, "vibra");
if (node) {
of_node_put(node);
return true;
#endif
}

return false;
}

Expand Down

0 comments on commit 85e9b13

Please sign in to comment.