IB/qib: clean up properly if pci_set_consistent_dma_mask() fails

Clean up properly if pci_set_consistent_dma_mask() fails.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 8a64426..48b6674 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -103,9 +103,11 @@ int qib_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent)
                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
        } else
                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
        } else
                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

-       if (ret)
+       if (ret) {

                qib_early_err(&pdev->dev,
                              "Unable to set DMA consistent mask: %d\n", ret);
                qib_early_err(&pdev->dev,
                              "Unable to set DMA consistent mask: %d\n", ret);

+               goto bail;
+       }

 
        pci_set_master(pdev);
        ret = pci_enable_pcie_error_reporting(pdev);
 
        pci_set_master(pdev);
        ret = pci_enable_pcie_error_reporting(pdev);