From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (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 250C4480DEB for ; Mon, 14 Sep 2026 17:14:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789406059; cv=none; b=oWJtovo3n+TbmwAjCq4uXel5U2WqKnLtZDmjFpb5m1cYOxUYqYdZ32An0ZU3yMCKNJToE+GQmFFm18wH3mnuAzH7vydwm4c0ClmWJ+D2tqafxNmzpNYv2EbXkPQyqvb37ULGRpv/Vcb9rzWziwZNlfSndeAj+vjxw9QKQz92CCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789406059; c=relaxed/simple; bh=x+duut9tMSHe9M751Ne3IHM+XA1aiC7lvKFmrcwMlNo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=SlVbHBG0QN+qyZYwJ5vgNGNTARQsqVtsNffQ174grs+VSr3aAOR5oUSex6GKjpAZk40+PLwi4lt61etnpgt6Hkynzi4lRBYvVPSS2VMqH4uU/xGJyRLXwL9ntOoKQrByzYB7tjzVWrPpXZdeMBFDbrvY7Z0hUzcPO0JLb+1idYg= 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=sGLIlWcu; arc=none smtp.client-ip=74.125.227.140 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="sGLIlWcu" Received: by mail-pj2-f12.google.com with SMTP id d9443c01a7336-2d747eb79f7so15332425ad.1 for ; Mon, 14 Sep 2026 10:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789406055; x=1790010855; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=chltb2wD8PD97rawmjna+iNh1esiaae/NnONMgkrsOM=; b=sGLIlWcuHRq07hTxqC0bxwmYS/ejM0FtuJMPMxw0yuvHisWFSvmT7uOgiOze57Ov71 aYEmOKInT487cJnWiATDdf2b/BuWJuQFiKPspbSwKf0JtmMM9eCO5E+w+uby2mUSzRlz oy0S48obt/PMnWe2ZF7+3oCqpXFAHuB3G+5AaUtNHd7IseNrWvzV/ooKd5PBR5JRtIfX ozkmMbTvavfxAdk5sCzkd2KkGVylPcOtS/UkmNaiVo0P18FOowf3VP0mu4saoL2+xlHD CLhmxMMU/j/7vw3Y0uEq1segA+xtoh/6/s1uEV7W4Ms4rWWVG8l9s3eXO89CwRmEuVTT UJdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789406055; x=1790010855; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=chltb2wD8PD97rawmjna+iNh1esiaae/NnONMgkrsOM=; b=horkCpMQgMqxd1mIRWTej4n2KBI4r63waoyysp7oKGPKhDi8ZapCxme8SSdEUdsJJn sEjVd2VEIUjBDBvSzx1zCaOWjIODRY9eyE7s2OlwFWnAv2oUllgiTWFwIUF7z54g8iCY no0xtInJLCGFWIP7W2+OPNYr4EYgXaDGfcEWpfNBdwlg/7Jvc91JShOhkCx++tZ44kU5 0Eck2lNh4bRTZT/I3JJuWnWebaMw9QRPgYxyYSJJDsro63Zjpc6Z4IwM3jBhRbSV5QNo ENe+9LTliPDWk4DXMjbU2BFbxBLZvtnyVSV3g55DZdUtnwnR4N8MDMdaERPcmWvSKOgB VzfQ== X-Forwarded-Encrypted: i=1; AKwUvBwHqZg9JBMbhYocBmZr81yKyhJ4eJCt/gJ/W1LJrxZ+NO1bf0fT1hp3UJe69yUPjm6y/ibcNKgAvvc=@vger.kernel.org X-Gm-Message-State: AFuF++mn2Izx0rkywqkwcdyIWHsfkrnRB+XnDuPAIIFHRE3c4xaXh0Fk QbkP4Sti2jwTgOn9mvatEBsW1QgxnpOXOAyWyM39zfcQ2VAQoo68bc7G X-Gm-Gg: AYBFou10NspObGJa0lCSgd7T2Euw7hIqtG/4LE33iJ/ki7yFZ3AiBI5xLM5c1XsclCm 2g5xApgS9J/EUy5qwQPFgaH3LnXG9f2NWVCFo/1kacq3z1rEGktusFBt+++yRQ97l+R6QCqbr7j qxvK6c/4qbLYCLFJuNBFwyZHkJf9wxRQYYh3kpd0AkspMr0fpQ4vpWDBooH38zeMTioT6g8ZgIh Zxl5gPXThWzWQjiqELozkSJ7ebvCCexPs5Uv51OHI7/VLWyk6zPEtqomlgF1Hy/tJOqk/lh5OQn VlWlixJyl2/TPMxmc4tRs0hjYS6AVQd/Sh2/0Fep7Xnkw8V0wvYqE+qGb327sPQCA2sFZeiXXiC inKuRYMYs50pAxQnRSzDoyZKcMe2IycM1HVg5GOA6OnnyB3k71oGngjHUUiXcLwrlnd5HJEulgt BUN9+aZihEITLA2cXyd6R97A3vgjzagybew3dcQc4iyPF+K1Tem7Z1k7QtB9bPYSVjQiT1N3Edb pUTYhYwXn/+fysoeNrxnoKdj7Q8kJizVYcF4gW15ACTsz3XAtoBa5JaGG59HXsJEqY= X-Received: by 2002:a17:902:fc4b:b0:2db:257c:9fd5 with SMTP id d9443c01a7336-2dd6c70df7dmr87697855ad.16.1789406054956; Mon, 14 Sep 2026 10:14:14 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.166.246.74]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2dd445de320sm42227055ad.8.2026.09.14.10.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 10:14:14 -0700 (PDT) From: Felix Gu Date: Tue, 15 Sep 2026 01:14:08 +0800 Subject: [PATCH] usb: musb: mpfs: tidy up error handling in probe() Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260915-mpfs-1-v1-1-a12c2fd7e0d9@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/yXMSwqAMAxF0a1IxhbaIEXdijjwk2oEPzQqgnTvV h0euO/dIOSZBMrkBk8nC69LhEkT6MZmGUhxHw2o0erCZGrenCijkLRFh4XBnCDGmyfH13dU1b/ laCfq9ncNITz5pZeQagAAAA== X-Change-ID: 20260914-mpfs-1-2e062f29128e To: Conor Dooley , Daire McNamara , Bin Liu , Greg Kroah-Hartman Cc: linux-riscv@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789406049; l=2192; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=x+duut9tMSHe9M751Ne3IHM+XA1aiC7lvKFmrcwMlNo=; b=mawbIY5TSFJDmO2pUO7rWizxkVTG8cUkHVInrILkyMjQvw0v8fkUWH+Wy1kv/OlG+UEhSOuJB 40xtPVYNWvXBaevGfylbceWEhrxXZwZ+2P77UWQ4T8l398KRVYCieom X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= Restructure the probe error labels so each failure only tears down what was already acquired, and stop calling usb_phy_generic_unregister() with NULL or an ERR_PTR() on paths where the phy was never registered. The old error paths only worked because platform_device_del() and platform_device_put() ignore NULL and ERR_PTR() arguments. Signed-off-by: Felix Gu --- drivers/usb/musb/mpfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c index 587127abd30a..59625ed95656 100644 --- a/drivers/usb/musb/mpfs.c +++ b/drivers/usb/musb/mpfs.c @@ -276,13 +276,13 @@ static int mpfs_probe(struct platform_device *pdev) if (IS_ERR(clk)) { dev_err(&pdev->dev, "failed to get clock\n"); ret = PTR_ERR(clk); - goto err_phy_release; + goto err_pdev_put; } ret = clk_prepare_enable(clk); if (ret) { dev_err(&pdev->dev, "failed to enable clock\n"); - goto err_phy_release; + goto err_pdev_put; } musb_pdev->dev.parent = dev; @@ -324,29 +324,29 @@ static int mpfs_probe(struct platform_device *pdev) ret = platform_device_add_resources(musb_pdev, pdev->resource, pdev->num_resources); if (ret) { dev_err(dev, "failed to add resources\n"); - goto err_clk_disable; + goto err_phy_release; } ret = platform_device_add_data(musb_pdev, pdata, sizeof(*pdata)); if (ret) { dev_err(dev, "failed to add platform_data\n"); - goto err_clk_disable; + goto err_phy_release; } ret = platform_device_add(musb_pdev); if (ret) { dev_err(dev, "failed to register musb device\n"); - goto err_clk_disable; + goto err_phy_release; } dev_info(&pdev->dev, "Registered MPFS MUSB driver\n"); return 0; -err_clk_disable: - clk_disable_unprepare(clk); - err_phy_release: usb_phy_generic_unregister(glue->phy); +err_clk_disable: + clk_disable_unprepare(clk); +err_pdev_put: platform_device_put(musb_pdev); return ret; } --- base-commit: 68142f986ff04b2b70b31db00f719bf690f64a9a change-id: 20260914-mpfs-1-2e062f29128e Best regards, -- Felix Gu