From nobody Sun Feb 8 15:57:44 2026 Received: from mail-pj1-f98.google.com (mail-pj1-f98.google.com [209.85.216.98]) (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 66FF230FC21 for ; Fri, 16 Jan 2026 00:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524657; cv=none; b=KGA01f6Hb7lXVsrMtikBrowbOOLPjrgGw9foBZq3S0P2PRGGlEVxRp6UVetqMTC5Ya6nUDE2n1mmZZaRoVEKtyjFHXXBStc6uB8Js03Toc3mXuQ1NMucBC/3XckW19X96w76E2Eac3F0jO/2G58UB2MbrBTRiRDiPledM789Zeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768524657; c=relaxed/simple; bh=B68hiSoceJbcqhNRzfhRMhhxS2RswzXuTBa7G6mFQh0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eGcf9P8UXTzVQf+u1fWWjs+gtAq5bHcsKiHbUiPYl+GICzCIDlfG/ZSDUQMXg5V7m+lrYXyakPP2F17YG2O6IyH0JOnwvS2EGtmv9BH0yO1bOEU9qPn+f3tMdv15bHcql4b/M+7Q7nU6KipXBAhZFrFGVd2qpL/5xpzCndCyrLw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=AhfzsMIq; arc=none smtp.client-ip=209.85.216.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="AhfzsMIq" Received: by mail-pj1-f98.google.com with SMTP id 98e67ed59e1d1-34cf1e31f85so738303a91.1 for ; Thu, 15 Jan 2026 16:50:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768524647; x=1769129447; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QHSl7KjNCmlL34Leswa6T4gMldUPRkc0V/lVqvwLlhY=; b=vpobWLeWV/2nlGpnol432h10Q781yoPMlyLYKui0c7EZa6AXFtzfa4RWsxhIiv3MH/ 1z5goXn1u+kyXYqr7t9K0nkQqW3xae0wMZcJJ6+PS2eKxLxXTlawuHGH05eKcBdQ7yeg +VVH5G2JxwbWeSIUYaG7Og6pk65XIyI0qdwDBVqTIP5icigLG29HQp2yRjsHgdL7MLko hyRzah7ohsRZR83zq8ZsWyUHQMaPatYdVmH6XojExjw/1aUO4puFlXJdaC09pqGYrska wqM1Bm1EQ5xzZeI8bCkynZSysFkbjwfRmJ3mw6t803GkJDvunOBPY3afPuwn/acTmjSA WzFw== X-Forwarded-Encrypted: i=1; AJvYcCU2+vf2fPg8aGHMyqTHQED4S1Cmb4Ix8mZJPTMtuwtfHegbx32rpZCbXcj9mGbkqnbTgS5lu6vYQpmjPKY=@vger.kernel.org X-Gm-Message-State: AOJu0YyJTJ7xCa333cIFwP4TVoJGEszBzt9f+JzOP0O8m6X8DfIwA8Uf uUP05G4006GCedDWMtcaWaA/Vq1WWOawe1PyDMqqMSwQgMmFW9cLEg39N94XhxHeukXcoaK4LRN 8gBETG9dnBHSRONjuTIBMYPnpOFzw0xf3VdO2Y3ikJK3qkJIntOlp9ihFGbh/Li8x+oQiabcIer ITUNo81JrDsvXwLU7gq/gR8h+dLVSwVuZ6UXB9NTWCRta0HAm0ldBBfoXGDYm1bwEq8KzkmQftY NxUmNR5VPLcm4LTKg== X-Gm-Gg: AY/fxX5SIe6CVHQmOBDjSe7IJL55Wwuv0MWsZbytZGm9bpKJCHPyoRbcM2Tvsi/mSEB 9NS6Ad7Irso+HNuEXog9gEelmSf1uirQZtbRXJCV+PyZZI5siIj55xTdHXA1w12s8vgjYVt/rzW IzyasvGLjCtl6ImJJeI1xuk05hGWHj13kCYguTu2xLCcw2IIiOjZib717rOt6im579qp5D2DtUw y/bOCAO0KTEzQDJaA/7t/zJ+Jai6yFgO4etCNpx4qwl4FdRZ2DxJcUNlw0EnRV1CNe1Lm6i7DoP kbyUdZqDcDBWaILXx73WR7QbxkL8FbxEjg39IFDL+5+DPXwUriEifwS/wgOa6CvwPk0CfLGST7W SqMaBplLkqqMjm+Mrnj65KxjguHI/Ko1AzdQ3NfT97GBiRQ0NPJymRyWnFvmVDNOFYCvk589/RK olaeTSMRfYl1/vMX96lilyRoieOWdK8/EtfrTYvlQW X-Received: by 2002:a17:90b:3c89:b0:343:7714:4caa with SMTP id 98e67ed59e1d1-35272ebb8dcmr1071158a91.3.1768524646718; Thu, 15 Jan 2026 16:50:46 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-2.dlp.protect.broadcom.com. [144.49.247.2]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-352677c7adbsm606197a91.2.2026.01.15.16.50.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2026 16:50:46 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dl1-f72.google.com with SMTP id a92af1059eb24-121b1cb8377so2903400c88.0 for ; Thu, 15 Jan 2026 16:50:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1768524645; x=1769129445; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QHSl7KjNCmlL34Leswa6T4gMldUPRkc0V/lVqvwLlhY=; b=AhfzsMIqwUsgBws6T0ln5cnR3rZP+2SRB8OmsIynkWP7Ystt8rwrFv7iaUicWlFzv+ +nycr1kCpeOF1LyjR88l19BhQWmBDguTXm0RwhVUsLA8QuF10j0eFiIAkdcCgJagrdyf /NOrUCcZdaUJKaOfo4qpEMyALJ5NpI0OBu8NI= X-Forwarded-Encrypted: i=1; AJvYcCV7oS0zP6GrjRJJbAeNCbo/zogsWXghf5/nhTRpUg4j/La1m4/ExlAooIacIrTCV0Ke/udPDYhWAVc2mdQ=@vger.kernel.org X-Received: by 2002:a05:7022:4388:b0:123:34c2:55ff with SMTP id a92af1059eb24-1244a72ec3dmr1640212c88.20.1768524644963; Thu, 15 Jan 2026 16:50:44 -0800 (PST) X-Received: by 2002:a05:7022:4388:b0:123:34c2:55ff with SMTP id a92af1059eb24-1244a72ec3dmr1640197c88.20.1768524644472; Thu, 15 Jan 2026 16:50:44 -0800 (PST) Received: from stbsdo-bld-1.sdg.broadcom.net ([192.19.161.248]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1244ac6c2besm1162305c88.5.2026.01.15.16.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 16:50:44 -0800 (PST) From: justin.chen@broadcom.com To: florian.fainelli@broadcom.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, richardcochran@gmail.com Cc: bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Justin Chen Subject: [PATCH net-next 3/3] net: bcmasp: streamline early exit and fix leak Date: Thu, 15 Jan 2026 16:50:37 -0800 Message-Id: <20260116005037.540490-4-justin.chen@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260116005037.540490-1-justin.chen@broadcom.com> References: <20260116005037.540490-1-justin.chen@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" From: Justin Chen Fix an early exit cleanup leak by unregistering of_phy_fixed_link() Streamline the bcmasp_probe early exit. As support for other functionality is added(i.e. ptp), it is easier to keep track of early exit cleanup when it is all in one place. Signed-off-by: Justin Chen --- drivers/net/ethernet/broadcom/asp2/bcmasp.c | 27 ++++++++++--------- .../net/ethernet/broadcom/asp2/bcmasp_intf.c | 5 +++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethe= rnet/broadcom/asp2/bcmasp.c index 36df7d1a9be3..aa6d8606849f 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c @@ -1317,6 +1317,8 @@ static int bcmasp_probe(struct platform_device *pdev) =20 bcmasp_core_init_filters(priv); =20 + bcmasp_init_wol(priv); + ports_node =3D of_find_node_by_name(dev->of_node, "ethernet-ports"); if (!ports_node) { dev_warn(dev, "No ports found\n"); @@ -1328,16 +1330,14 @@ static int bcmasp_probe(struct platform_device *pde= v) intf =3D bcmasp_interface_create(priv, intf_node, i); if (!intf) { dev_err(dev, "Cannot create eth interface %d\n", i); - bcmasp_remove_intfs(priv); - ret =3D -ENOMEM; - goto of_put_exit; + of_node_put(ports_node); + ret =3D -EINVAL; + goto err_cleanup; } list_add_tail(&intf->list, &priv->intfs); i++; } - - /* Check and enable WoL */ - bcmasp_init_wol(priv); + of_node_put(ports_node); =20 /* Drop the clock reference count now and let ndo_open()/ndo_close() * manage it for us from now on. @@ -1352,19 +1352,20 @@ static int bcmasp_probe(struct platform_device *pde= v) list_for_each_entry(intf, &priv->intfs, list) { ret =3D register_netdev(intf->ndev); if (ret) { - netdev_err(intf->ndev, - "failed to register net_device: %d\n", ret); - bcmasp_wol_irq_destroy(priv); - bcmasp_remove_intfs(priv); - goto of_put_exit; + dev_err(dev, "failed to register net_device: %d\n", ret); + goto err_cleanup; } count++; } =20 dev_info(dev, "Initialized %d port(s)\n", count); =20 -of_put_exit: - of_node_put(ports_node); + return ret; + +err_cleanup: + bcmasp_wol_irq_destroy(priv); + bcmasp_remove_intfs(priv); + return ret; } =20 diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net= /ethernet/broadcom/asp2/bcmasp_intf.c index 6cddd3280cb8..f3b8d94f4791 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -1228,7 +1228,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bc= masp_priv *priv, netdev_err(intf->ndev, "invalid PHY mode: %s for port %d\n", phy_modes(intf->phy_interface), intf->port); ret =3D -EINVAL; - goto err_free_netdev; + goto err_unregister_fixed_link; } =20 ret =3D of_get_ethdev_address(ndev_dn, ndev); @@ -1252,6 +1252,9 @@ struct bcmasp_intf *bcmasp_interface_create(struct bc= masp_priv *priv, =20 return intf; =20 +err_unregister_fixed_link: + if (of_phy_is_fixed_link(ndev_dn)) + of_phy_deregister_fixed_link(ndev_dn); err_free_netdev: free_netdev(ndev); err: --=20 2.34.1