[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 10 Nov 2017 17:43:00 -0800
From: Stephen Boyd <sboyd@...eaurora.org>
To: Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-usb@...r.kernel.org, Rob Clark <robdclark@...il.com>,
Peter Robinson <pbrobinson@...il.com>
Subject: [PATCH] usb: ulpi: Add missing of_node_get() in ulpi_of_register()
In ulpi_of_register() we call of_find_node_by_name() which
unconditionally calls of_node_put() on the 'from' argument. We
haven't called of_node_get() though, so we've put the node once
without getting it first. Add the of_node_get() call so that
things are properly balanced.
Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT")
Reported-by: Peter Robinson <pbrobinson@...il.com>
Signed-off-by: Stephen Boyd <sboyd@...eaurora.org>
---
drivers/usb/common/ulpi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
index 4aa5195db8ea..59e05eff76f9 100644
--- a/drivers/usb/common/ulpi.c
+++ b/drivers/usb/common/ulpi.c
@@ -182,9 +182,9 @@ static int ulpi_of_register(struct ulpi *ulpi)
/* Find a ulpi bus underneath the parent or the grandparent */
parent = ulpi->dev.parent;
- if (parent->of_node)
+ if (of_node_get(parent->of_node))
np = of_find_node_by_name(parent->of_node, "ulpi");
- else if (parent->parent && parent->parent->of_node)
+ else if (parent->parent && of_node_get(parent->parent->of_node))
np = of_find_node_by_name(parent->parent->of_node, "ulpi");
if (!np)
return 0;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Powered by blists - more mailing lists