Merge branch 'linus/master' into rdma.git for-next

[linux-2.6-block.git] / drivers / infiniband / hw / hfi1 / pcie.c

diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c
index de3ee606034ca993a9eece7d5fd884f512d717f5..eec83757d55f94331936518804672a72b8e29898 100644 (file)
--- a/drivers/infiniband/hw/hfi1/pcie.c
+++ b/drivers/infiniband/hw/hfi1/pcie.c
@@ -900,9 +900,7 @@ static int trigger_sbr(struct hfi1_devdata *dd)
         * delay after a reset is required.  Per spec requirements,
         * the link is either working or not after that point.
         */
-       pci_reset_bridge_secondary_bus(dev->bus->self);
-
-       return 0;
+       return pci_reset_bus(dev);
 }
 
 /*