---

yaml
---
r: 82303
b: refs/heads/master
c: f362b8b
h: refs/heads/master
i:
  82301: 15c8821
  82299: 32a1111
  82295: b5f8f59
  82287: b3d6be7
  82271: fc78c06
  82239: 4431a57
  82175: aa6c1d0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4348a2dc49f9baecd34a9b0904245488c6189398
+refs/heads/master: f362b8bffea5963f6f11e6cc3dc3b3beb853ddbb

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");