Commit 8345b153 authored by Xu Yang's avatar Xu Yang Committed by Greg Kroah-Hartman
Browse files

usb: roles: get usb role switch from parent only for usb-b-connector 



usb_role_switch_is_parent() was walking up to the parent node and checking
for the "usb-role-switch" property regardless of the type of the passed
fwnode. This could cause unrelated device nodes to be probed as potential
role switch parent, leading to spurious matches and "-EPROBE_DEFER" being
returned infinitely.

Till now only Type-B connector node will have a parent node which may
present "usb-role-switch" property and register the role switch device.
For Type-C connector node, its parent node will always be a Type-C chip
device which will never register the role switch device. However, it may
still present a non-boolean "usb-role-switch = <&usb_controller>" property
for historical compatibility.

So restrict the helper to only operate on Type-B connector when attempting
to get the role switch from parent node.

Fixes: 6fadd729 ("usb: roles: get usb-role-switch from parent")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarXu Yang <xu.yang_2@nxp.com>
Tested-by: default avatarArnaud Ferraris <arnaud.ferraris@collabora.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://patch.msgid.link/20260309074313.2809867-3-xu.yang_2@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b275bfa

drivers/usb/roles/class.c

+6 −1
Original line number Diff line number Diff line
@@ -139,9 +139,14 @@ static void *usb_role_switch_match(const struct fwnode_handle *fwnode, const cha 
static struct usb_role_switch *

usb_role_switch_is_parent(struct fwnode_handle *fwnode)

{

	struct fwnode_handle *parent = fwnode_get_parent(fwnode);

	struct fwnode_handle *parent;

	struct device *dev;



	if (!fwnode_device_is_compatible(fwnode, "usb-b-connector"))

		return NULL;



	parent = fwnode_get_parent(fwnode);



	if (!fwnode_property_present(parent, "usb-role-switch")) {

		fwnode_handle_put(parent);

		return NULL;