diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/pci/remove.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/pci/remove.c')
| -rw-r--r-- | drivers/pci/remove.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 86503c14ce7e..176615e7231f 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c | |||
| @@ -32,8 +32,6 @@ static void pci_stop_dev(struct pci_dev *dev) | |||
| 32 | 32 | ||
| 33 | static void pci_destroy_dev(struct pci_dev *dev) | 33 | static void pci_destroy_dev(struct pci_dev *dev) |
| 34 | { | 34 | { |
| 35 | pci_stop_dev(dev); | ||
| 36 | |||
| 37 | /* Remove the device from the device lists, and prevent any further | 35 | /* Remove the device from the device lists, and prevent any further |
| 38 | * list accesses from this device */ | 36 | * list accesses from this device */ |
| 39 | down_write(&pci_bus_sem); | 37 | down_write(&pci_bus_sem); |