diff options
| author |   Andrew Duggan <aduggan@synaptics.com> | 2016-07-14 09:35:44 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-14 09:40:39 -0700 |
| commit | 9624516db0f3ffcbd1ba1007775d068f54049773 (patch) | |
| tree | b676d77a5c13f372cda53cb4f05beee9362a9640 /drivers/input/rmi4/rmi_bus.c | |
| parent | Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE" (diff) | |
| download | linux-dev-9624516db0f3ffcbd1ba1007775d068f54049773.tar.xz linux-dev-9624516db0f3ffcbd1ba1007775d068f54049773.zip | |
Input: synaptics-rmi4 - use of_get_child_by_name() to fix refcount
Calling of_find_node_by_name() assumes that the caller has incremented
the refcount of the of_node being passed in. Currently, the caller is
not incrementing the refcount of the of_node which results in the node
being prematurely freed when of_find_node_by_name() calls of_node_put()
on it. Instead use of_get_child_by_name() which does not call put on the
of_node.
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4/rmi_bus.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index b368b0515c5a..253df96be427 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -157,11 +157,11 @@ static int rmi_function_match(struct device *dev, struct device_driver *drv) static void rmi_function_of_probe(struct rmi_function *fn) { char of_name[9]; + struct device_node *node = fn->rmi_dev->xport->dev->of_node; snprintf(of_name, sizeof(of_name), "rmi4-f%02x", fn->fd.function_number); - fn->dev.of_node = of_find_node_by_name( - fn->rmi_dev->xport->dev->of_node, of_name); + fn->dev.of_node = of_get_child_by_name(node, of_name); } #else static inline void rmi_function_of_probe(struct rmi_function *fn) |