projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
pci
/
hotplug
/
cpci_hotplug_pci.c
diff --git
a/drivers/pci/hotplug/cpci_hotplug_pci.c
b/drivers/pci/hotplug/cpci_hotplug_pci.c
index
c878028
..
225b5e5
100644
(file)
--- a/
drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/
drivers/pci/hotplug/cpci_hotplug_pci.c
@@
-315,9
+315,12
@@
int cpci_unconfigure_slot(struct slot* slot)
PCI_DEVFN(PCI_SLOT(slot->devfn), i));
if (dev) {
pci_remove_bus_device(dev);
-
slot->dev = NULL
;
+
pci_dev_put(dev)
;
}
}
+ pci_dev_put(slot->dev);
+ slot->dev = NULL;
+
dbg("%s - exit", __FUNCTION__);
return 0;
}