mlxbf_gige: stop PHY during open() error paths

[ Upstream commit d6c30c5a168f8586b8bcc0d8e42e2456eb05209b ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index 679415a64f25c6b2c349b127e74da0b4fffc1ff0..621594061fb572a80f7b2f7acdf7b38f2c491d10 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -159,7 +159,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;
@@ -187,6 +187,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;