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
Merge branch 'for-4.7/drivers' of git://git.kernel.dk/linux-block
[linux-2.6-block.git]
/
drivers
/
nvme
/
host
/
pci.c
diff --git
a/drivers/nvme/host/pci.c
b/drivers/nvme/host/pci.c
index fb741d09831aaa6536e3ccdb4e69b7de486d448d..0f093f14d3482394630b66c8586da5beb455d8c4 100644
(file)
--- a/
drivers/nvme/host/pci.c
+++ b/
drivers/nvme/host/pci.c
@@
-2020,7
+2020,6
@@
static void nvme_remove(struct pci_dev *pdev)
flush_work(&dev->reset_work);
nvme_uninit_ctrl(&dev->ctrl);
nvme_dev_disable(dev, true);
- flush_work(&dev->reset_work);
nvme_dev_remove_admin(dev);
nvme_free_queues(dev, 0);
nvme_release_cmb(dev);