diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 18:14:20 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 18:14:20 +0300 |
| commit | 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 (patch) | |
| tree | 124784a459d055a97506b37ce3d51e9713485922 /drivers/usb/gadget/u_ether.c | |
| parent | 37c95bfe944babae817bfcf02c996729c9a3335d (diff) | |
| download | linux-569ff2de2e1c8ac67c8df3a7367d46d0d9460a35.tar.xz | |
usb: don't use flush_scheduled_work()
flush_scheduled_work() is being deprecated. Directly flush or cancel
work items instead.
* u_ether, isp1301_omap, speedtch conversions are straight-forward.
* ochi-hcd should only flush when quirk_nec() is true as otherwise the
work wouldn't have been initialized.
* In oti6858, cancel_delayed_work() + flush_scheduled_work() ->
cancel_delayed_work_sync().
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Duncan Sands <duncan.sands@free.fr>
Cc: linux-usb@vger.kernel.org
Diffstat (limited to 'drivers/usb/gadget/u_ether.c')
| -rw-r--r-- | drivers/usb/gadget/u_ether.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index fbe86ca95802..00a78248d764 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -829,11 +829,9 @@ void gether_cleanup(void) return; unregister_netdev(the_dev->net); + flush_work_sync(&the_dev->work); free_netdev(the_dev->net); - /* assuming we used keventd, it must quiesce too */ - flush_scheduled_work(); - the_dev = NULL; } |