]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mlxbf_gige: stop PHY during open() error paths
authorDavid Thompson <davthompson@nvidia.com>
Wed, 20 Mar 2024 19:31:17 +0000 (15:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Mar 2024 11:05:21 +0000 (11:05 +0000)
The mlxbf_gige_open() routine starts the PHY as part of normal
initialization.  The mlxbf_gige_open() routine must stop the
PHY during its error paths.

Fixes: f92e1869d74e ("Add Mellanox BlueField Gigabit Ethernet driver")
Signed-off-by: David Thompson <davthompson@nvidia.com>
Reviewed-by: Asmaa Mnebhi <asmaa@nvidia.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c

index 3d09fa54598f1abc79cb15c90d5cedbe1bb44496..cef0e2d3f1a7b7c9a41de1917b9d20991c9f1286 100644 (file)
@@ -157,7 +157,7 @@ static int mlxbf_gige_open(struct net_device *netdev)
 
        err = mlxbf_gige_tx_init(priv);
        if (err)
-               goto free_irqs;
+               goto phy_deinit;
        err = mlxbf_gige_rx_init(priv);
        if (err)
                goto tx_deinit;
@@ -185,6 +185,9 @@ static int mlxbf_gige_open(struct net_device *netdev)
 tx_deinit:
        mlxbf_gige_tx_deinit(priv);
 
+phy_deinit:
+       phy_stop(phydev);
+
 free_irqs:
        mlxbf_gige_free_irqs(priv);
        return err;