projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qlcnic: Fix usage of netif_tx_{wake, stop} api during link change.
[linux-2.6-block.git]
/
drivers
/
pci
/
remove.c
diff --git
a/drivers/pci/remove.c
b/drivers/pci/remove.c
index 1576851028db700be2413b01e815cc8387b3cd47..cc9337a71529180eaebc7beb991dfb7c9e186ea8 100644
(file)
--- a/
drivers/pci/remove.c
+++ b/
drivers/pci/remove.c
@@
-24,7
+24,7
@@
static void pci_stop_dev(struct pci_dev *dev)
if (dev->is_added) {
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);
if (dev->is_added) {
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);
- device_
del
(&dev->dev);
+ device_
release_driver
(&dev->dev);
dev->is_added = 0;
}
dev->is_added = 0;
}
@@
-34,6
+34,8
@@
static void pci_stop_dev(struct pci_dev *dev)
static void pci_destroy_dev(struct pci_dev *dev)
{
static void pci_destroy_dev(struct pci_dev *dev)
{
+ device_del(&dev->dev);
+
down_write(&pci_bus_sem);
list_del(&dev->bus_list);
up_write(&pci_bus_sem);
down_write(&pci_bus_sem);
list_del(&dev->bus_list);
up_write(&pci_bus_sem);