From: Daniel Mack <zonque@gmail.com>
Date: Wed, 5 Feb 2014 14:34:18 +0000 (+0100)
Subject: usb: musb: correct use of schedule_delayed_work()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ccfaf74e766d49a64f86943f98d0a82996d4dec;p=deliverable%2Flinux.git

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>
---

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;
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index 32f49e1efa9c..e2d2d8c9891b 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -135,7 +135,8 @@ void musb_port_suspend(struct musb *musb, bool do_suspend)
 
 		/* later, GetPortStatus will stop RESUME signaling */
 		musb->port1_status |= MUSB_PORT_STAT_RESUME;
-		schedule_delayed_work(&musb->finish_resume_work, 20);
+		schedule_delayed_work(&musb->finish_resume_work,
+				      msecs_to_jiffies(20));
 	}
 }
 
@@ -171,8 +172,7 @@ void musb_port_reset(struct musb *musb, bool do_reset)
 			if (musb->rh_timer > 0 && remain > 0) {
 				/* take into account the minimum delay after resume */
 				schedule_delayed_work(
-					&musb->deassert_reset_work,
-					jiffies_to_msecs(remain));
+					&musb->deassert_reset_work, remain);
 				return;
 			}
 
@@ -180,7 +180,8 @@ void musb_port_reset(struct musb *musb, bool do_reset)
 				    power & ~MUSB_POWER_RESUME);
 
 			/* Give the core 1 ms to clear MUSB_POWER_RESUME */
-			schedule_delayed_work(&musb->deassert_reset_work, 1);
+			schedule_delayed_work(&musb->deassert_reset_work,
+					      msecs_to_jiffies(1));
 			return;
 		}
 
@@ -190,7 +191,8 @@ void musb_port_reset(struct musb *musb, bool do_reset)
 
 		musb->port1_status |= USB_PORT_STAT_RESET;
 		musb->port1_status &= ~USB_PORT_STAT_ENABLE;
-		schedule_delayed_work(&musb->deassert_reset_work, 50);
+		schedule_delayed_work(&musb->deassert_reset_work,
+				      msecs_to_jiffies(50));
 	} else {
 		dev_dbg(musb->controller, "root port reset stopped\n");
 		musb_writeb(mbase, MUSB_POWER,