diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 16:14:20 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:14:20 +0100 |
| commit | 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 (patch) | |
| tree | 124784a459d055a97506b37ce3d51e9713485922 /drivers/usb/serial/oti6858.c | |
| parent | 37c95bfe944babae817bfcf02c996729c9a3335d (diff) | |
| download | kernel_samsung_smdk4412-569ff2de2e1c8ac67c8df3a7367d46d0d9460a35.zip kernel_samsung_smdk4412-569ff2de2e1c8ac67c8df3a7367d46d0d9460a35.tar.gz kernel_samsung_smdk4412-569ff2de2e1c8ac67c8df3a7367d46d0d9460a35.tar.bz2 | |
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/serial/oti6858.c')
| -rw-r--r-- | drivers/usb/serial/oti6858.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index e199b0f..5be866b 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -613,9 +613,8 @@ static void oti6858_close(struct usb_serial_port *port) dbg("%s(): after buf_clear()", __func__); /* cancel scheduled setup */ - cancel_delayed_work(&priv->delayed_setup_work); - cancel_delayed_work(&priv->delayed_write_work); - flush_scheduled_work(); + cancel_delayed_work_sync(&priv->delayed_setup_work); + cancel_delayed_work_sync(&priv->delayed_write_work); /* shutdown our urbs */ dbg("%s(): shutting down urbs", __func__); |