diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2011-11-07 06:55:46 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-12-05 13:21:46 -0500 |
commit | 027e8d52abdd44bc00e405af83cd2fbfb96c0824 (patch) | |
tree | 564d7597177b1b69fa5260f1949888c8aeb5497d | |
parent | 3c076351c4027a56d5005a39a0b518a4ba393ce2 (diff) |
PCI: pciehp: Fix wrong workqueue cleanup
Fix improper workqueue cleanup.
In the current pciehp, pcied_cleanup() calls destroy_workqueue()
before calling pcie_port_service_unregister(). This causes kernel oops
because flush_workqueue() is called in the pcie_port_service_unregister()
code path after the workqueue was destroyed. So pcied_cleanup() must call
pcie_port_service_unregister() first before calling destroy_workqueue().
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 7ac8358df8f..a13ad1308ad 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
@@ -366,9 +366,9 @@ static int __init pcied_init(void) | |||
366 | static void __exit pcied_cleanup(void) | 366 | static void __exit pcied_cleanup(void) |
367 | { | 367 | { |
368 | dbg("unload_pciehpd()\n"); | 368 | dbg("unload_pciehpd()\n"); |
369 | pcie_port_service_unregister(&hpdriver_portdrv); | ||
369 | destroy_workqueue(pciehp_ordered_wq); | 370 | destroy_workqueue(pciehp_ordered_wq); |
370 | destroy_workqueue(pciehp_wq); | 371 | destroy_workqueue(pciehp_wq); |
371 | pcie_port_service_unregister(&hpdriver_portdrv); | ||
372 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); | 372 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); |
373 | } | 373 | } |
374 | 374 | ||