diff options
| author | Dmitry Torokhov | 2016-07-19 20:02:56 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2016-07-19 20:02:56 +0200 |
| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /drivers/input/rmi4 | |
| parent | Input: pixcir_ts - add support for axis inversion / swapping (diff) | |
| parent | Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle (diff) | |
| download | kernel-qcow2-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.gz kernel-qcow2-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz kernel-qcow2-linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.zip | |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'drivers/input/rmi4')
| -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) |