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 EB585415619; Sat, 28 Feb 2026 17:45:17 +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=1772300718; cv=none; b=sq/7VP03KESB+/P02OqMVxp6oNLMlZqfMLLfxV8z8VKicw3Fnp3DZ1fRX17FpwBfiQYNb0iTVPv6pdWQ4Paawr/FQiLPxwcuav+VEG7ZezSYDSKCyRLPRB4cVtVK3oqT/B0EZTvWqZPI555lPT7a1LdgyKKNG3yWdJFwDNU0rng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300718; c=relaxed/simple; bh=EtV2LE5whI6918UgcOFQyk+HwlHhhT9iTKC/U1RTuVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jaeb/fo3H6bnw/mVRqwlCrwccE3QWk0M57JqzjQmi/lG4xkjClC3jep3VU6ktmDgF2i6Pp+dsVklZ6dgKuGRih/d7HsXoo3/Nde4MEL0+7JSnIWl5dw9L4wql7h40i8QrJk2Sm/kL6qnKycfcEuOHjiovbPfhNYeiYYc7/QSZO4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sq51djEH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sq51djEH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E97D9C116D0; Sat, 28 Feb 2026 17:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300717; bh=EtV2LE5whI6918UgcOFQyk+HwlHhhT9iTKC/U1RTuVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sq51djEHMDRXuoHzOui7neaRMJOUzGEy2brsp1tjgA+AMDE3FCGdUeK/v3LlZMjJ5 bYVbMrySU4w0+0bSupWsO5cDVKJfAGJ8Al2w/YoEk3dmLRTpp57da9g9FmOMZWeze1 5MHwmql6c9Kj12O2IC8jTGApnbkkS++P70ZGc8kgIJow+K11XWpbTgkMJ/OuIGQOp3 TNV4zSQvUwUnNl9LYyvV701G8zuwMYJVaeMhWcWO2MOZFnP9f+bOtsCUvBvEpjyxsL 2R2a2xPTgU8gJX2k8u5GnCAPes2K/+vqGEYXoKCTv+zNup01WYBf4IhhjGDyJI4Glk K+usNU0pLSB3w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kevin Hao , Alexander Sverdlin , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.19 753/844] net: cpsw_new: Fix unnecessary netdev unregistration in cpsw_probe() error path Date: Sat, 28 Feb 2026 12:31:06 -0500 Message-ID: <20260228173244.1509663-754-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Kevin Hao [ Upstream commit 62db84b7efa63b78aed9fdbdae90f198771be94c ] The current error handling in cpsw_probe() has two issues: - cpsw_unregister_ports() may be called before cpsw_register_ports() has been executed. - cpsw_unregister_ports() is already invoked within cpsw_register_ports() in case of a register_netdev() failure, but the error path would call it again. Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Kevin Hao Cc: stable@vger.kernel.org Reviewed-by: Alexander Sverdlin Link: https://patch.msgid.link/20260205-cpsw-error-path-v1-1-6e58bae6b299@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/cpsw_new.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index 21af0a10626aa..b9fc31eb06134 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -2003,7 +2003,7 @@ static int cpsw_probe(struct platform_device *pdev) /* setup netdevs */ ret = cpsw_create_ports(cpsw); if (ret) - goto clean_unregister_netdev; + goto clean_cpts; /* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and * MISC IRQs which are always kept disabled with this driver so @@ -2017,14 +2017,14 @@ static int cpsw_probe(struct platform_device *pdev) 0, dev_name(dev), cpsw); if (ret < 0) { dev_err(dev, "error attaching irq (%d)\n", ret); - goto clean_unregister_netdev; + goto clean_cpts; } ret = devm_request_irq(dev, cpsw->irqs_table[1], cpsw_tx_interrupt, 0, dev_name(dev), cpsw); if (ret < 0) { dev_err(dev, "error attaching irq (%d)\n", ret); - goto clean_unregister_netdev; + goto clean_cpts; } if (!cpsw->cpts) @@ -2034,7 +2034,7 @@ static int cpsw_probe(struct platform_device *pdev) 0, dev_name(&pdev->dev), cpsw); if (ret < 0) { dev_err(dev, "error attaching misc irq (%d)\n", ret); - goto clean_unregister_netdev; + goto clean_cpts; } /* Enable misc CPTS evnt_pend IRQ */ @@ -2043,7 +2043,7 @@ static int cpsw_probe(struct platform_device *pdev) skip_cpts: ret = cpsw_register_notifiers(cpsw); if (ret) - goto clean_unregister_netdev; + goto clean_cpts; ret = cpsw_register_devlink(cpsw); if (ret) @@ -2065,8 +2065,6 @@ static int cpsw_probe(struct platform_device *pdev) clean_unregister_notifiers: cpsw_unregister_notifiers(cpsw); -clean_unregister_netdev: - cpsw_unregister_ports(cpsw); clean_cpts: cpts_release(cpsw->cpts); cpdma_ctlr_destroy(cpsw->dma); -- 2.51.0