]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bnxt_en: Failure to update PHY is not fatal condition.
authorMichael Chan <mchan@broadcom.com>
Sat, 20 Feb 2016 00:43:21 +0000 (19:43 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Sep 2020 09:45:33 +0000 (11:45 +0200)
commit ba41d46fe03223279054e58d570069fdc62fb768 upstream.

If we fail to update the PHY, we should print a warning and continue.
The current code to exit is buggy as it has not freed up the NIC
resources yet.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index a3949c1a0c234d5560252e2d233b138b37105486..0d7ed152504fd791b4cffd8635de6fd68a936bd7 100644 (file)
@@ -4623,7 +4623,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
        if (link_re_init) {
                rc = bnxt_update_phy_setting(bp);
                if (rc)
-                       goto open_err;
+                       netdev_warn(bp->dev, "failed to update phy settings\n");
        }
 
        if (irq_re_init) {