| Message ID | 1464979153-2386-1-git-send-email-aduggan@synaptics.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Jun 03 2016 or thereabouts, Andrew Duggan wrote: > Increment the refcount for the transport device's of_node before calling > of_find_node_by_name(). Since of_find_node_by_name() assumes the refcount > was incremented by the caller and calls of_node_put() when it is done. That is some weird API. I guess it must be used with: of_node = of_find_node_by_name(of_node, of_name); Anyway: Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cheers, Benjamin > > Signed-off-by: Andrew Duggan <aduggan@synaptics.com> > --- > drivers/input/rmi4/rmi_bus.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c > index b368b05..55b5336 100644 > --- a/drivers/input/rmi4/rmi_bus.c > +++ b/drivers/input/rmi4/rmi_bus.c > @@ -157,11 +157,12 @@ 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); > + of_node_get(node); > + fn->dev.of_node = of_find_node_by_name(node, of_name); > } > #else > static inline void rmi_function_of_probe(struct rmi_function *fn) > -- > 2.5.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index b368b05..55b5336 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -157,11 +157,12 @@ 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); + of_node_get(node); + fn->dev.of_node = of_find_node_by_name(node, of_name); } #else static inline void rmi_function_of_probe(struct rmi_function *fn)
Increment the refcount for the transport device's of_node before calling of_find_node_by_name(). Since of_find_node_by_name() assumes the refcount was incremented by the caller and calls of_node_put() when it is done. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> --- drivers/input/rmi4/rmi_bus.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)