| From 754dd99245215ffcb5f6d41cdeddb129c4cde00d Mon Sep 17 00:00:00 2001 |
| From: Michael Chan <michael.chan@broadcom.com> |
| Date: Sun, 22 Mar 2020 16:40:04 -0400 |
| Subject: [PATCH] bnxt_en: Free context memory after disabling PCI in probe |
| error path. |
| |
| commit 62bfb932a51f6d08eb409248e69f8d6428c2cabd upstream. |
| |
| Other shutdown code paths will always disable PCI first to shutdown DMA |
| before freeing context memory. Do the same sequence in the error path |
| of probe to be safe and consistent. |
| |
| Fixes: c20dc142dd7b ("bnxt_en: Disable bus master during PCI shutdown and driver unload.") |
| Signed-off-by: Michael Chan <michael.chan@broadcom.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| [PG: no health struct in v5.2, hence only one line moves.] |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
| index 9e911c399ef5..7e7e216ed022 100644 |
| --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
| +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
| @@ -10851,10 +10851,10 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
| init_err_pci_clean: |
| bnxt_free_hwrm_short_cmd_req(bp); |
| bnxt_free_hwrm_resources(bp); |
| + bnxt_cleanup_pci(bp); |
| bnxt_free_ctx_mem(bp); |
| kfree(bp->ctx); |
| bp->ctx = NULL; |
| - bnxt_cleanup_pci(bp); |
| |
| init_err_free: |
| free_netdev(dev); |
| -- |
| 2.7.4 |
| |
