[PATCH net] bnxt_en: Release PCI regions when DMA mask setup fails during probe.

[PATCH net] bnxt_en: Release PCI regions when DMA mask setup fails during probe.

[Michael Chan]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

Jump to init_err_release to cleanup.  bnxt_unmap_bars() will also be
called but it will do nothing if the BARs are not mapped yet.

Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 6e8329534cde..0af0af2b70fe 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11591,7 +11591,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
 	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) {
 		dev_err(&pdev->dev, "System does not support DMA, aborting\n");
 		rc = -EIO;
-		goto init_err_disable;
+		goto init_err_release;
 	}
 
 	pci_set_master(pdev);
-- 
2.18.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4166 bytes --]

Re: [PATCH net] bnxt_en: Release PCI regions when DMA mask setup fails during probe.

[Jakub Kicinski]

On Fri, 20 Nov 2020 02:44:31 -0500 Michael Chan wrote:
> Jump to init_err_release to cleanup.  bnxt_unmap_bars() will also be
> called but it will do nothing if the BARs are not mapped yet.
> 
> Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.")
> Reported-by: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Applied, thanks!