From e8e7fce6eb94ea72c0b0f88f144c5d49f4e38391 Mon Sep 17 00:00:00 2001
From: Joonwoo Park <joonwpark81@gmail.com>
Date: Fri, 12 Oct 2007 16:20:29 -0700
Subject: [PATCH] --- yaml --- r: 82303 b: refs/heads/master c:
 f362b8bffea5963f6f11e6cc3dc3b3beb853ddbb h: refs/heads/master i:   82301:
 15c88211ff8545c976580c5222f855f1c529b9cb   82299:
 32a111156a696ac301a1153cb80f6d9fed2e18ae   82295:
 b5f8f5940c7a5da64b80e8922076fe4678c009d7   82287:
 b3d6be7182828e1b8638af09810258256a8d4632   82271:
 fc78c06170300bc6ec2e5c71094e845a1e4a7835   82239:
 4431a57705a6eee338fb0ea5c4a829b4ce763692   82175:
 aa6c1d018b5a2cf015db6c2fc1fbccceb312a363 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/pci/hotplug/ibmphp_core.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e818fab2f8e8..aeaa3976da46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4348a2dc49f9baecd34a9b0904245488c6189398
+refs/heads/master: f362b8bffea5963f6f11e6cc3dc3b3beb853ddbb
diff --git a/trunk/drivers/pci/hotplug/ibmphp_core.c b/trunk/drivers/pci/hotplug/ibmphp_core.c
index a90c28d0c69d..87b6b8b280e6 100644
--- a/trunk/drivers/pci/hotplug/ibmphp_core.c
+++ b/trunk/drivers/pci/hotplug/ibmphp_core.c
@@ -761,10 +761,13 @@ static void ibm_unconfigure_device(struct pci_func *func)
 	debug("func->device << 3 | 0x0  = %x\n", func->device << 3 | 0x0);
 
 	for (j = 0; j < 0x08; j++) {
-		temp = pci_find_slot(func->busno, (func->device << 3) | j);
-		if (temp)
+		temp = pci_get_bus_and_slot(func->busno, (func->device << 3) | j);
+		if (temp) {
 			pci_remove_bus_device(temp);
+			pci_dev_put(temp);
+		}
 	}
+	pci_dev_put(func->dev);
 }
 
 /*
@@ -823,7 +826,7 @@ static int ibm_configure_device(struct pci_func *func)
 	if (!(bus_structure_fixup(func->busno)))
 		flag = 1;
 	if (func->dev == NULL)
-		func->dev = pci_find_slot(func->busno,
+		func->dev = pci_get_bus_and_slot(func->busno,
 				PCI_DEVFN(func->device, func->function));
 
 	if (func->dev == NULL) {
@@ -836,7 +839,7 @@ static int ibm_configure_device(struct pci_func *func)
 		if (num)
 			pci_bus_add_devices(bus);
 
-		func->dev = pci_find_slot(func->busno,
+		func->dev = pci_get_bus_and_slot(func->busno,
 				PCI_DEVFN(func->device, func->function));
 		if (func->dev == NULL) {
 			err("ERROR... : pci_dev still NULL\n");