]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bnxt_en: Release PCI regions when DMA mask setup fails during probe.
authorMichael Chan <michael.chan@broadcom.com>
Fri, 20 Nov 2020 07:44:31 +0000 (02:44 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Dec 2020 07:51:54 +0000 (08:51 +0100)
[ Upstream commit c54bc3ced5106663c2f2b44071800621f505b00e ]

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>
Link: https://lore.kernel.org/r/1605858271-8209-1-git-send-email-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index f726c91a9b3bc17319303494960077d1b39981d8..50efdcf681083a076e2a853a6ebad8a0a4345ec2 100644 (file)
@@ -11274,7 +11274,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);