diff options
| author |   Vikas Gupta <vikas.gupta@broadcom.com> | 2018-07-09 02:24:52 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-09 16:27:14 -0700 |
| commit | c58387ab1614f6d7fb9e244f214b61e7631421fc (patch) | |
| tree | 221e21494ef4bf95260923a992cc2f5905a5a880 /drivers/net | |
| parent | bnxt_en: Do not modify max IRQ count after RDMA driver requests/frees IRQs. (diff) | |
| download | linux-dev-c58387ab1614f6d7fb9e244f214b61e7631421fc.tar.xz linux-dev-c58387ab1614f6d7fb9e244f214b61e7631421fc.zip | |
bnxt_en: Fix for system hang if request_irq fails
Fix bug in the error code path when bnxt_request_irq() returns failure.
bnxt_disable_napi() should not be called in this error path because
NAPI has not been enabled yet.
Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
Signed-off-by: Vikas Gupta <vikas.gupta@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 11b21ad0a672..4394c1162be4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -6890,7 +6890,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) rc = bnxt_request_irq(bp); if (rc) { netdev_err(bp->dev, "bnxt_request_irq err: %x\n", rc); - goto open_err; + goto open_err_irq; } } @@ -6930,6 +6930,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) open_err: bnxt_debug_dev_exit(bp); bnxt_disable_napi(bp); + +open_err_irq: bnxt_del_napi(bp); open_err_free_mem: |