diff options
| author | Amitoj Kaur Chawla <amitoj1606@gmail.com> | 2016-02-17 23:06:14 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-20 14:53:27 -0800 |
| commit | 5be2f42b50fd76ca5cba2927ab88b7974d8ee8b5 (patch) | |
| tree | f49a63049dce6c0644609fd7fa6d6143c9810582 /drivers/staging | |
| parent | 896774f631d8377a674fd2b79097b57bab297c16 (diff) | |
| download | talos-obmc-linux-5be2f42b50fd76ca5cba2927ab88b7974d8ee8b5.tar.gz talos-obmc-linux-5be2f42b50fd76ca5cba2927ab88b7974d8ee8b5.zip | |
staging: wlan-ng: Remove flush_scheduled_work
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wlan-ng/prism2usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c index 194f67e0fc06..ae6a53cebf44 100644 --- a/drivers/staging/wlan-ng/prism2usb.c +++ b/drivers/staging/wlan-ng/prism2usb.c @@ -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 |
