From fc37ba392928ad785d9c2852ab5c4d8a2c1adbb0 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Mon, 25 Oct 2010 21:19:06 -0700 Subject: [PATCH] --- yaml --- r: 217761 b: refs/heads/master c: 2ca78d23a758d3299abd128556debff4c1fefb16 h: refs/heads/master i: 217759: 50fd50a8802dc1f3ac3c59ea9f5cc6ee0efd4f97 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_pcie.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4cd8af824fe8..294e56041c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d26a1df23f7e904e7b03bb2580288f6ae7cfe48 +refs/heads/master: 2ca78d23a758d3299abd128556debff4c1fefb16 diff --git a/trunk/drivers/infiniband/hw/qib/qib_pcie.c b/trunk/drivers/infiniband/hw/qib/qib_pcie.c index 8a644266f4aa..48b6674cbc49 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_pcie.c +++ b/trunk/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)); - if (ret) + if (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);