summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan2016-02-20 01:43:21 +0100
committerDavid S. Miller2016-02-20 05:39:32 +0100
commitba41d46fe03223279054e58d570069fdc62fb768 (patch)
tree47c62c6aef979ce46a7de611ba3d3b98928ce6f5
parentbnxt_en: Remove unnecessary call to update PHY settings. (diff)
downloadkernel-qcow2-linux-ba41d46fe03223279054e58d570069fdc62fb768.tar.gz
kernel-qcow2-linux-ba41d46fe03223279054e58d570069fdc62fb768.tar.xz
kernel-qcow2-linux-ba41d46fe03223279054e58d570069fdc62fb768.zip
bnxt_en: Failure to update PHY is not fatal condition.
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>
-rw-r--r--drivers/net/ethernet/broadcom/bnxt/bnxt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 78f6b5a2b6a0..8ab000dd52d9 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4642,7 +4642,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) {