Commit 6b275bfa authored by Xu Yang's avatar Xu Yang Committed by Greg Kroah-Hartman
Browse files

Revert "tcpm: allow looking for role_sw device in the main node" 



This reverts commit 1366cd22.

The fwnode_usb_role_switch_get() returns NULL only if no connection is
found, returns ERR_PTR(-EPROBE_DEFER) if connection is found but deferred
probe is needed, or a valid pointer of usb_role_switch.

When switching from a NULL check to IS_ERR_OR_NULL(), usb_role_switch_get()
returns NULL and overwrites the ERR_PTR(-EPROBE_DEFER) returned by
fwnode_usb_role_switch_get(). This causes the deferred probe indication to
be lost, preventing the USB role switch from ever being retrieved.

Fixes: 1366cd22 ("tcpm: allow looking for role_sw device in the main node")
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-2-xu.yang_2@nxp.com


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

drivers/usb/typec/tcpm/tcpm.c

+1 −1
Original line number Diff line number Diff line
@@ -7890,7 +7890,7 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) 
	port->partner_desc.identity = &port->partner_ident;



	port->role_sw = fwnode_usb_role_switch_get(tcpc->fwnode);

	if (IS_ERR_OR_NULL(port->role_sw))

	if (!port->role_sw)

		port->role_sw = usb_role_switch_get(port->dev);

	if (IS_ERR(port->role_sw)) {

		err = PTR_ERR(port->role_sw);