From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65B903A9DBC; Wed, 21 Jan 2026 18:22:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769019727; cv=none; b=kWtj6cNDOQWkEF5iaRnt/4AJlkn3/9Rh306eUktKT9tS7kwq+DSBA7ihSnDWZCH2cgqWPTZKe6n83NF2u2Eu/S40rpeTJgFTekPUz0MVktWBgtBPUO94HIxKTlki+jybes/pyeLcMvVzUwY3DT5Hqb+uIkJxkgzd6LqJ6suuwF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769019727; c=relaxed/simple; bh=gI9pNNhmZwnSdkg4yJVC3ckl87SM2IcJblwg/nhJI80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HGWN8d7SN9HVzlOwcoMePGmhBDdTf9IgU1bbMiaGqVJTn/2hASDWdilADw4xY1s+XYmiYaDagbPmV3A8Vhp56i5mMKLo/4/jZOi6Z8oE1y4K1hdgB9ShcYCclwl1FU8uCdyGnauI/zYrQ2iNK3gtkvkP5/sgOdQNo2hqtq0brkQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OxJz00I5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OxJz00I5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C99E6C4CEF1; Wed, 21 Jan 2026 18:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769019727; bh=gI9pNNhmZwnSdkg4yJVC3ckl87SM2IcJblwg/nhJI80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OxJz00I59O0SjZXbMQI9JhtI7ppzB2rboJ6/UNR0mi8btPe0a3KT+uDoK72pFbgs3 UGKDInCcItSRqrwtpB0yi19yfENHmXAaxPs1pcLnceCzbTq0j09wEROHIZ04C8i/Ca ELM3NFvo7+Ox0jaLdbQwJDLy85nIhqDFSZL9R97c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Heikki Krogerus , Dragan Simic , Arnaud Ferraris Subject: [PATCH 6.12 089/139] tcpm: allow looking for role_sw device in the main node Date: Wed, 21 Jan 2026 19:15:37 +0100 Message-ID: <20260121181414.659310870@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121181411.452263583@linuxfoundation.org> References: <20260121181411.452263583@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaud Ferraris commit 1366cd228b0c67b60a2c0c26ef37fe9f7cfedb7f upstream. If 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 Reviewed-by: Heikki Krogerus Reviewed-by: Dragan Simic Signed-off-by: Arnaud Ferraris Link: https://patch.msgid.link/20260105-fix-ppp-power-v2-1-6924f5a41224@collabora.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -7697,7 +7697,7 @@ struct tcpm_port *tcpm_register_port(str 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);