aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 10:14:20 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 10:14:20 -0500
commit569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 (patch)
tree124784a459d055a97506b37ce3d51e9713485922 /drivers/usb/otg
parent37c95bfe944babae817bfcf02c996729c9a3335d (diff)
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/otg')
-rw-r--r--drivers/usb/otg/isp1301_omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 456969492410..e00fa1b22ecd 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -1247,7 +1247,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
1247 isp->timer.data = 0; 1247 isp->timer.data = 0;
1248 set_bit(WORK_STOP, &isp->todo); 1248 set_bit(WORK_STOP, &isp->todo);
1249 del_timer_sync(&isp->timer); 1249 del_timer_sync(&isp->timer);
1250 flush_scheduled_work(); 1250 flush_work_sync(&isp->work);
1251 1251
1252 put_device(&i2c->dev); 1252 put_device(&i2c->dev);
1253 the_transceiver = NULL; 1253 the_transceiver = NULL;