aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-02-13 15:58:53 -0500
committerFelipe Balbi <balbi@ti.com>2015-04-07 13:58:35 -0400
commit7a606ac29752a3e571b83f9b3fceb1eaa1d37781 (patch)
tree074b1e59b4b303769d5d3d7657616d53e73b5992 /drivers/usb
parent84c0d178eb9f3a3ae4d63dc97a440266cf17f7f5 (diff)
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/r8a66597-hcd.c2
1 files changed, 1 insertions, 1 deletions
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)
2301 rh->port &= ~USB_PORT_STAT_SUSPEND; 2301 rh->port &= ~USB_PORT_STAT_SUSPEND;
2302 rh->port |= USB_PORT_STAT_C_SUSPEND << 16; 2302 rh->port |= USB_PORT_STAT_C_SUSPEND << 16;
2303 r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg); 2303 r8a66597_mdfy(r8a66597, RESUME, RESUME | UACT, dvstctr_reg);
2304 msleep(50); 2304 msleep(USB_RESUME_TIMEOUT);
2305 r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg); 2305 r8a66597_mdfy(r8a66597, UACT, RESUME | UACT, dvstctr_reg);
2306 } 2306 }
2307 2307