Skip to content

Commit 6de4436

Browse files
Ryceancurrykuba-moo
authored andcommitted
net: bcmasp: fix early exit leak with fixed phy
We are not deregistering the fixed phy link when hitting the early exit condition. Add the correct early exit sequence. Fixes: 490cb41 ("net: bcmasp: Add support for ASP2.0 Ethernet controller") Signed-off-by: Justin Chen <justin.chen@broadcom.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://patch.msgid.link/20260122194001.1098859-1-justin.chen@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent d48c896 commit 6de4436

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
12611261
netdev_err(intf->ndev, "invalid PHY mode: %s for port %d\n",
12621262
phy_modes(intf->phy_interface), intf->port);
12631263
ret = -EINVAL;
1264-
goto err_free_netdev;
1264+
goto err_deregister_fixed_link;
12651265
}
12661266

12671267
ret = of_get_ethdev_address(ndev_dn, ndev);
@@ -1286,6 +1286,9 @@ struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,
12861286

12871287
return intf;
12881288

1289+
err_deregister_fixed_link:
1290+
if (of_phy_is_fixed_link(ndev_dn))
1291+
of_phy_deregister_fixed_link(ndev_dn);
12891292
err_free_netdev:
12901293
free_netdev(ndev);
12911294
err:

0 commit comments

Comments
 (0)