From nobody Mon Jun 8 04:25:06 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 429193E9584 for ; Tue, 2 Jun 2026 14:12:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780409569; cv=none; b=r36vnGlUbgvoRGrAwAv5Z7poTxvTjXOcaugO6kmP6dsEsgjaCCH5wM6HxHkgBETl46gP9ySucqKQTCSWaJuU/uZJ7sO4XsPExdN0mp17p45/6V2YIOnD/CGh92aGis5WCnp24wfzAorpabbEz3LNMY9fRvIV1nqqrUOKeVQzI0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780409569; c=relaxed/simple; bh=kpmGkkU11ecTwdVdTxlaGp+lNBsMTsb/Nj9af5UXA/A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=ard7kBbdJ68mtNHI8i6XHM+OQtXdJua4vGxCGcnxVmTW0Wupqm40szYUF00mZmVimOJaqndAJbBSzsQdKHjw4sSKitCKhtT31njnOmGgHqsVh9K0b75CISU4416WIj5D52e+fGTopQ/751JSo1EiHMVgQd+TwH4Pn3MBMDAc6Qk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fs68IyJC; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fs68IyJC" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-36da151a152so1712553a91.1 for ; Tue, 02 Jun 2026 07:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780409567; x=1781014367; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=7XCowtVnjKXnbcRNuimTNpT8EiRYTBtdlRiIVINQJ3g=; b=fs68IyJCZ5b5VBT1ijgGTOyu3K7lOAnP4Q0dD7CDKDe2ON0xLCIyEXLCt6WsC4bkmo B2MgStEKe3ibaAZFAgee5jHzH4ZU+xNtXVckGpjLZOYiV+w2gbzNmb5jSdwjYKkyk2Vf SpZJP2otl0/2clBsoNkG3jzlGGuEh/MHBdMLPZJiO//CQY1tmB5oxLAZ7fi79Xt+kkUa XU8IIkBlOmfMxiNSLMs9QEc+8JPP5/Wonq0lJmilKT0OPm92lC0JucZk6kXHMfEhxcUZ XH4jXOrLG8O2Vwy1ap/6HYWBDvcZY8cJxEk8TjZYtyKCtJLt+GAEBUlbBHrKr7etvu5P TeAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780409567; x=1781014367; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7XCowtVnjKXnbcRNuimTNpT8EiRYTBtdlRiIVINQJ3g=; b=rt7c1OtwRFxy3fVdbH1VaM9QNVjyz58oNFzcOrMpLBPUFFwDEL/CP6At9IRqXtR79s 0IhxC/XddauoTDE5rMHl0JZPZxIVwODZxTnFdVGR3S6JLUblp23/ZoBoOLie1fuc1106 XENDGdr1zckI692QJcD/B9W8USVC9u00F0DEhBRcgS8vS/p8msRu2D471YoOphBhILGZ iSwohrUBprmMtWS21USkGPt3SZ2gX7W91JtMgpGSFNGjuufrvGhMs0QsO8y7cpf3XYmz mVarckSVnXvBFUWhn5wkEg51/KQL6vlU0c25rDCnyslDmlMboEUzO7tIdw2txWcf+pbk wjrQ== X-Forwarded-Encrypted: i=1; AFNElJ984rgosef1rhmKFdH0ADU5kULFggUewgtqFzYwU2Az2gDmN4y6O+AVGtcJcF3DblCXmaAVHA/L2fZL7BU=@vger.kernel.org X-Gm-Message-State: AOJu0YxOYXWsr+hpyiD/PFjJRtBpYy+AK0bzIieTor4DwuvQlI2GJBbW 3oQTDDfRshz/y9bYo1bVhMJDH3Az8W3EUkOWq7uOCw2q3eUsLjsjkm9HPmApg3ZU X-Gm-Gg: Acq92OGfIjnG/hZAx2yyKItOZB0QK1vrAiSd+eSLPNiPeTWR+Ov1IhhAT+hH/sQeqsn TTNTPDVlorYqLaQfL3S1A9iesCOFg7663x6x+FKJucm9BureBMcEUxr4xb+a/35gKHg7h63Kszf CKCr9XzuTV8znq4pZkztSO7h/Mmne6YQa7OSlJwBFoBJNg9oTrpooTPHWT+p+Q+cC9C5cND9VJ5 /AdQY7aTnYVFDG5ONRy7e+m1pc8Idl/uwW9iRURMm6ekBV0dZW0R59I5FrhYMlSQdGWoFhLV4ge lW5Onyf0qO9f1w3muu0Wu4VEFt+xFwV2uJsSZyF9DUz2Jjie6xhiDU2/B7EdTvUgamoGuJPHljw tywnI4vdpIDWsuD9PuEHkb+LwKF0NvOa5zO4AraucuWrfIQvedpefNX+800EcNlk53qFGUwX2dn P/FR0af17dOOyNipWRG0sNjbQUrpBGOT2rhaEd6QDyf4lO0GlqaFM/9OqPQ4Xotp+4X8T+6fUj7 EDMJBvpHbtPRdk544HCY5NtRr7H X-Received: by 2002:a17:90b:3442:b0:36c:e254:4d5 with SMTP id 98e67ed59e1d1-36ce25410d6mr9832117a91.4.1780409567301; Tue, 02 Jun 2026 07:12:47 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.166.246.30]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36dd90415besm3601775a91.0.2026.06.02.07.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 07:12:46 -0700 (PDT) From: Felix Gu Date: Tue, 02 Jun 2026 22:12:41 +0800 Subject: [PATCH] phy: fsl-imx8mq-usb: fix typec switch leak on probe error path Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260602-imx8mq-typec-v1-1-3debe9bc77d9@gmail.com> X-B4-Tracking: v=1; b=H4sIANjkHmoC/yXMTQ5AMBBA4avIrDWZdtHgKmJBTRmJvxapiLsrl t/ivQs8OSYPRXKBo4M9z1OETBMwfT11JLiNBoVKo0YleAzZuIrtXMgIhbW2spU5ooWYLI4sh29 XVr/93gxktvcB9/0A33aWg3AAAAA= X-Change-ID: 20260602-imx8mq-typec-20a6f1d1900f To: Vinod Koul , Neil Armstrong , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Xu Yang , Jun Li Cc: linux-phy@lists.infradead.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780409563; l=2735; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=kpmGkkU11ecTwdVdTxlaGp+lNBsMTsb/Nj9af5UXA/A=; b=4YSIt8pCDNOFocdXGuAudSQFQldGYnUBr8V6MOtFtbIGLD00AcsWNSa6+B/Ptk3ul3742sf1P htOMmlEyovCCgKwh7yZxmffvwspM7qwRIj/dbKpNJgLdmX5jcRHNlr2 X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= If probe fails after imx95_usb_phy_get_tca() succeeds, the typec switch leaks because the only cleanup path was in .remove, which never runs on probe failure. Use devm_add_action_or_reset() so the switch is cleaned up on both probe failure and driver removal. The .remove callback and imx95_usb_phy_put_tca() are no longer needed. Fixes: b58f0f86fd61 ("phy: fsl-imx8mq-usb: add tca function driver for imx9= 5") Signed-off-by: Felix Gu Reviewed-by: Frank Li Reviewed-by: Xu Yang --- drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/frees= cale/phy-fsl-imx8mq-usb.c index b05d80e849a1..8af5a4f85698 100644 --- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c +++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c @@ -173,8 +173,10 @@ static struct typec_switch_dev *tca_blk_get_typec_swit= ch(struct platform_device return sw; } =20 -static void tca_blk_put_typec_switch(struct typec_switch_dev *sw) +static void tca_blk_put_typec_switch(void *data) { + struct typec_switch_dev *sw =3D data; + typec_switch_unregister(sw); } =20 @@ -248,6 +250,7 @@ static struct tca_blk *imx95_usb_phy_get_tca(struct pla= tform_device *pdev, struct device *dev =3D &pdev->dev; struct resource *res; struct tca_blk *tca; + int ret; =20 res =3D platform_get_resource(pdev, IORESOURCE_MEM, 1); if (!res) @@ -266,17 +269,11 @@ static struct tca_blk *imx95_usb_phy_get_tca(struct p= latform_device *pdev, tca->orientation =3D TYPEC_ORIENTATION_NORMAL; tca->sw =3D tca_blk_get_typec_switch(pdev, imx_phy); =20 - return tca; -} - -static void imx95_usb_phy_put_tca(struct imx8mq_usb_phy *imx_phy) -{ - struct tca_blk *tca =3D imx_phy->tca; - - if (!tca) - return; + ret =3D devm_add_action_or_reset(&pdev->dev, tca_blk_put_typec_switch, tc= a->sw); + if (ret) + return ERR_PTR(ret); =20 - tca_blk_put_typec_switch(tca->sw); + return tca; } =20 static u32 phy_tx_vref_tune_from_property(u32 percent) @@ -739,16 +736,8 @@ static int imx8mq_usb_phy_probe(struct platform_device= *pdev) return PTR_ERR_OR_ZERO(phy_provider); } =20 -static void imx8mq_usb_phy_remove(struct platform_device *pdev) -{ - struct imx8mq_usb_phy *imx_phy =3D platform_get_drvdata(pdev); - - imx95_usb_phy_put_tca(imx_phy); -} - static struct platform_driver imx8mq_usb_phy_driver =3D { .probe =3D imx8mq_usb_phy_probe, - .remove =3D imx8mq_usb_phy_remove, .driver =3D { .name =3D "imx8mq-usb-phy", .of_match_table =3D imx8mq_usb_phy_of_match, --- base-commit: 08484c504b55a98bd100527fbe10a3caf55ff3ff change-id: 20260602-imx8mq-typec-20a6f1d1900f Best regards, -- =20 Felix Gu