From: Felipe Balbi <balbi@ti.com>
Date: Fri, 13 Feb 2015 20:58:53 +0000 (-0600)
Subject: usb: host: r8a66597: use new USB_RESUME_TIMEOUT
X-Git-Tag: v4.1-rc1~154^2~4^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7a606ac29752a3e571b83f9b3fceb1eaa1d37781;p=karo-tx-linux.git

usb: host: r8a66597: use new USB_RESUME_TIMEOUT

While this driver was already using a 50ms resume
timeout, let's make sure everybody uses the same
macro so it's easy to fix later should anything
go wrong.

It also gives a more "stable" expectation to Linux
users.

Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index bdc82fea0a1f..54a417043e44 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2301,7 +2301,7 @@ static int r8a66597_bus_resume(struct usb_hcd *hcd)
 		rh->port &= ~USB_PORT_STAT_SUSPEND;
 		rh->port |= USB_PORT_STAT_C_SUSPEND << 16;
 		r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg);
-		msleep(50);
+		msleep(USB_RESUME_TIMEOUT);
 		r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg);
 	}