From: Michael Chan <mchan@broadcom.com>
Date: Sat, 20 Feb 2016 00:43:21 +0000 (-0500)
Subject: bnxt_en: Failure to update PHY is not fatal condition.
X-Git-Tag: v4.1.12-92~126^2~69
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=93b2ac8f32b823ca90d7fc52f8b6dc6e30e6a06a;p=users%2Fjedix%2Flinux-maple.git

bnxt_en: Failure to update PHY is not fatal condition.

Orabug: 23221795

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>
(cherry picked from commit ba41d46fe03223279054e58d570069fdc62fb768)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index b29c81673389c..4601d759e8d01 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4661,7 +4661,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) {