[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <aUpkppyoAnoSTV15@kuha>
Date: Tue, 23 Dec 2025 11:45:10 +0200
From: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
To: Arnaud Ferraris <arnaud.ferraris@...labora.com>
Cc: Badhri Jagan Sridharan <badhri@...gle.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Michael Grzeschik <m.grzeschik@...gutronix.de>,
linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
stable@...r.kernel.org
Subject: Re: [PATCH] tcpm: allow looking for role_sw device in the main node
Thu, Nov 27, 2025 at 03:04:15PM +0100, Arnaud Ferraris kirjoitti:
> When ports are defined in the tcpc main node, fwnode_usb_role_switch_get
> returns an error, meaning usb_role_switch_get (which would succeed)
> never gets a chance to run as port->role_sw isn't NULL, causing a
> regression on devices where this is the case.
>
> Fix this by turning the NULL check into IS_ERR_OR_NULL, so
> usb_role_switch_get can actually run and the device get properly probed.
>
> Fixes: 2d8713f807a4 ("tcpm: switch check for role_sw device with fw_node")
> Cc: stable@...r.kernel.org
> Signed-off-by: Arnaud Ferraris <arnaud.ferraris@...labora.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index cc78770509dbc..37698204d48d2 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -7877,7 +7877,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 (!port->role_sw)
> + if (IS_ERR_OR_NULL(port->role_sw))
> port->role_sw = usb_role_switch_get(port->dev);
> if (IS_ERR(port->role_sw)) {
> err = PTR_ERR(port->role_sw);
>
> ---
> base-commit: 765e56e41a5af2d456ddda6cbd617b9d3295ab4e
> change-id: 20251127-fix-ppp-power-6d47f3a746f8
>
> Best regards,
> --
> Arnaud Ferraris <arnaud.ferraris@...labora.com>
--
heikki
Powered by blists - more mailing lists