summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRalph Campbell <ralph.campbell@qlogic.com>2010-10-23 00:29:54 +0200
committerRoland Dreier <rolandd@cisco.com>2010-10-27 01:09:02 +0200
commit5d26a1df23f7e904e7b03bb2580288f6ae7cfe48 (patch)
tree56d3b58e74e58c3031fb87460fb8bd8f07aa1097 /drivers/infiniband
parentIB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set (diff)
downloadlinux-5d26a1df23f7e904e7b03bb2580288f6ae7cfe48.tar.xz
linux-5d26a1df23f7e904e7b03bb2580288f6ae7cfe48.zip
IB/qib: Allow driver to load if PCIe AER fails
Some PCIe root complex chip sets don't support advanced error reporting. Allow the driver to load OK if pci_enable_pcie_error_reporting() fails. Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/qib/qib_pcie.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 7fa6e5592630..8a644266f4aa 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -109,10 +109,12 @@ int qib_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
ret = pci_enable_pcie_error_reporting(pdev);
- if (ret)
+ if (ret) {
qib_early_err(&pdev->dev,
"Unable to enable pcie error reporting: %d\n",
ret);
+ ret = 0;
+ }
goto done;
bail: