]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wlan-ng: Remove flush_scheduled_work
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>
Wed, 17 Feb 2016 17:36:14 +0000 (23:06 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Feb 2016 22:53:27 +0000 (14:53 -0800)
flush_scheduled_work() is scheduled for deprecation. Use
cancel_work_sync() instead to ensure that there is no pending or
running work item.

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wlan-ng/prism2usb.c

index 194f67e0fc06c32a18eb891ad47a145f884a18e8..ae6a53cebf44a6ea863f326bfaf2df4ce1bb034c 100644 (file)
@@ -177,7 +177,8 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
                tasklet_kill(&hw->completion_bh);
                tasklet_kill(&hw->reaper_bh);
 
-               flush_scheduled_work();
+               cancel_work_sync(&hw->link_bh);
+               cancel_work_sync(&hw->commsqual_bh);
 
                /* Now we complete any outstanding commands
                 * and tell everyone who is waiting for their