projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| ba4a4fdd GKH |
1 | From foo@baz Wed Aug 22 10:28:26 CEST 2018 |
| 2 | From: Vikas Gupta <vikas.gupta@broadcom.com> | |
| 3 | Date: Mon, 9 Jul 2018 02:24:52 -0400 | |
| 4 | Subject: bnxt_en: Fix for system hang if request_irq fails | |
| 5 | ||
| 6 | From: Vikas Gupta <vikas.gupta@broadcom.com> | |
| 7 | ||
| 8 | [ Upstream commit c58387ab1614f6d7fb9e244f214b61e7631421fc ] | |
| 9 | ||
| 10 | Fix bug in the error code path when bnxt_request_irq() returns failure. | |
| 11 | bnxt_disable_napi() should not be called in this error path because | |
| 12 | NAPI has not been enabled yet. | |
| 13 | ||
| 14 | Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") | |
| 15 | Signed-off-by: Vikas Gupta <vikas.gupta@broadcom.com> | |
| 16 | Signed-off-by: Michael Chan <michael.chan@broadcom.com> | |
| 17 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 18 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | --- | |
| 21 | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +++- | |
| 22 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
| 23 | ||
| 24 | --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| 25 | +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| 26 | @@ -4591,7 +4591,7 @@ static int __bnxt_open_nic(struct bnxt * | |
| 27 | rc = bnxt_request_irq(bp); | |
| 28 | if (rc) { | |
| 29 | netdev_err(bp->dev, "bnxt_request_irq err: %x\n", rc); | |
| 30 | - goto open_err; | |
| 31 | + goto open_err_irq; | |
| 32 | } | |
| 33 | } | |
| 34 | ||
| 35 | @@ -4629,6 +4629,8 @@ static int __bnxt_open_nic(struct bnxt * | |
| 36 | ||
| 37 | open_err: | |
| 38 | bnxt_disable_napi(bp); | |
| 39 | + | |
| 40 | +open_err_irq: | |
| 41 | bnxt_del_napi(bp); | |
| 42 | ||
| 43 | open_err_free_mem: |