From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Date: Fri, 1 Mar 2019 11:05:45 +0000 (+0000)
Subject: usb: common: Consider only available nodes for dr_mode
X-Git-Tag: android-x86-8.1-r2~16^2~74^2~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=015e5c17617a83351370af268e7484aa145144cb;p=android-x86%2Fkernel.git

usb: common: Consider only available nodes for dr_mode

commit 238e0268c82789e4c107a37045d529a6dbce51a9 upstream.

There are cases where multiple device tree nodes point to the
same phy node by means of the "phys" property, but we should
only consider those nodes that are marked as available rather
than just any node.

Fixes: 98bfb3946695 ("usb: of: add an api to get dr_mode by the phy node")
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 48277bbc15e4..73c8e6591746 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -145,6 +145,8 @@ enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0)
 
 	do {
 		controller = of_find_node_with_property(controller, "phys");
+		if (!of_device_is_available(controller))
+			continue;
 		index = 0;
 		do {
 			if (arg0 == -1) {