shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

char: xillybus: Refine workqueue handling

Browse Source 
commit ad899c301c880766cc709aad277991b3ab671b66 upstream.

As the wakeup work item now runs on a separate workqueue, it needs to be
flushed separately along with flushing the device's workqueue.

Also, move the destroy_workqueue() call to the end of the exit method,
so that deinitialization is done in the opposite order of
initialization.

Fixes: ccbde4b128ef ("char: xillybus: Don't destroy workqueue from work item running on it")
Cc: stable <stable@kernel.org>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Link: https://lore.kernel.org/r/20240816070200.50695-1-eli.billauer@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eli Billauer
2024-08-16 10:01:59 +03:00
committed by Greg Kroah-Hartman
parent 5d3567caff
commit c83d9f2d89
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/xillybus/xillyusb.c
View File

@@ -2079,9 +2079,11 @@ static int xillyusb_discovery(struct usb_interface *interface)
* just after responding with the IDT, there is no reason for any * just after responding with the IDT, there is no reason for any
* work item to be running now. To be sure that xdev->channels * work item to be running now. To be sure that xdev->channels
* is updated on anything that might run in parallel, flush the * is updated on anything that might run in parallel, flush the
* workqueue, which rarely does anything. * device's workqueue and the wakeup work item. This rarely
* does anything.
*/ */
flush_workqueue(xdev->workq); flush_workqueue(xdev->workq);
flush_work(&xdev->wakeup_workitem);
xdev->num_channels = num_channels; xdev->num_channels = num_channels;
@@ -2258,9 +2260,9 @@ static int __init xillyusb_init(void)
static void __exit xillyusb_exit(void) static void __exit xillyusb_exit(void)
{ {
destroy_workqueue(wakeup_wq);
usb_deregister(&xillyusb_driver); usb_deregister(&xillyusb_driver);
destroy_workqueue(wakeup_wq);
} }
module_init(xillyusb_init); module_init(xillyusb_init);