diff options
| author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2011-11-07 20:55:46 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:32 +0000 |
| commit | b4f439edeea055ea3681618e1c299ab3a3d32cdc (patch) | |
| tree | fe5460a2b4f5391ef470f40ae97a349b7848c44b /drivers/pci | |
| parent | 3e4ba2bf729b851695f01b514e1605dc0cffd5c8 (diff) | |
| download | kernel_samsung_smdk4412-b4f439edeea055ea3681618e1c299ab3a3d32cdc.zip kernel_samsung_smdk4412-b4f439edeea055ea3681618e1c299ab3a3d32cdc.tar.gz kernel_samsung_smdk4412-b4f439edeea055ea3681618e1c299ab3a3d32cdc.tar.bz2 | |
PCI: pciehp: Fix wrong workqueue cleanup
commit 027e8d52abdd44bc00e405af83cd2fbfb96c0824 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/pci')
| -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 7ac8358..a13ad13 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) static void __exit pcied_cleanup(void) { dbg("unload_pciehpd()\n"); + pcie_port_service_unregister(&hpdriver_portdrv); destroy_workqueue(pciehp_ordered_wq); destroy_workqueue(pciehp_wq); - pcie_port_service_unregister(&hpdriver_portdrv); info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); } |