summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_core.c
diff options
context:
space:
mode:
authorDaniel Mack2014-02-05 15:34:18 +0100
committerFelipe Balbi2014-02-20 16:17:24 +0100
commit9ccfaf74e766d49a64f86943f98d0a82996d4dec (patch)
treee68fa516de135a0edd746dab5447d73bb4438b1c /drivers/usb/musb/musb_core.c
parentusb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP (diff)
downloadkernel-qcow2-linux-9ccfaf74e766d49a64f86943f98d0a82996d4dec.tar.gz
kernel-qcow2-linux-9ccfaf74e766d49a64f86943f98d0a82996d4dec.tar.xz
kernel-qcow2-linux-9ccfaf74e766d49a64f86943f98d0a82996d4dec.zip
usb: musb: correct use of schedule_delayed_work()
schedule_delayed_work() takes the delay in jiffies, not msecs. This bug slipped in with the recent reset logic cleanup (8ed1fb790ea: "usb: musb: finish suspend/reset work independently from musb_hub_control()"). Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
-rw-r--r--drivers/usb/musb/musb_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b49a5945c90c..239ad0b1ceb6 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -480,7 +480,8 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
musb->rh_timer = jiffies
+ msecs_to_jiffies(20);
schedule_delayed_work(
- &musb->finish_resume_work, 20);
+ &musb->finish_resume_work,
+ msecs_to_jiffies(20));
musb->xceiv->state = OTG_STATE_A_HOST;
musb->is_active = 1;