diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/pci/remove.c | |
| parent | Input: xpad - add new USB IDs for Logitech F310 and F710 (diff) | |
| parent | Input: wacom - add support for DTU-1031 (diff) | |
| download | linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/pci/remove.c')
| -rw-r--r-- | drivers/pci/remove.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 1576851028db..cc9337a71529 100644 --- 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); - device_del(&dev->dev); + device_release_driver(&dev->dev); 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) { + device_del(&dev->dev); + down_write(&pci_bus_sem); list_del(&dev->bus_list); up_write(&pci_bus_sem); |