From 6f63662d1604b16d7607f02b9955e6bf5626aa63 Mon Sep 17 00:00:00 2001
From: Jiang Liu <liuj97@gmail.com>
Date: Tue, 28 Aug 2012 23:43:56 +0800
Subject: [PATCH] --- yaml --- r: 324251 b: refs/heads/master c:
 a9d18b37e408b10854e15a918849194a4e089001 h: refs/heads/master i:   324249:
 9a3908e6d2a9923de0c94127dccf4d1720a9347e   324247:
 806e32f97975f07fb0707136046d65ac1fd919f0 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/pci/hotplug/cpcihp_generic.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 608ef8ee2100..1e63b8d0dfaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f85567c89e2500d4ce4ca2702025a47fac684f21
+refs/heads/master: a9d18b37e408b10854e15a918849194a4e089001
diff --git a/trunk/drivers/pci/hotplug/cpcihp_generic.c b/trunk/drivers/pci/hotplug/cpcihp_generic.c
index 81af764c629b..a6a71c41cdf8 100644
--- a/trunk/drivers/pci/hotplug/cpcihp_generic.c
+++ b/trunk/drivers/pci/hotplug/cpcihp_generic.c
@@ -154,12 +154,8 @@ static int __init cpcihp_generic_init(void)
 	if(!r)
 		return -EBUSY;
 
-	bus = pci_find_bus(0, bridge_busnr);
-	if (!bus) {
-		err("Invalid bus number %d", bridge_busnr);
-		return -EINVAL;
-	}
-	dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
+	dev = pci_get_domain_bus_and_slot(0, bridge_busnr,
+					  PCI_DEVFN(bridge_slot, 0));
 	if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
 		err("Invalid bridge device %s", bridge);
 		pci_dev_put(dev);