summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi2015-02-13 22:00:38 +0100
committerFelipe Balbi2015-04-07 19:58:36 +0200
commit08debfb13b199716da6153940c31968c556b195d (patch)
treeaf19c09db583505f19414a759bdd6408e0c77916 /drivers/usb
parentusb: host: r8a66597: use new USB_RESUME_TIMEOUT (diff)
downloadkernel-qcow2-linux-08debfb13b199716da6153940c31968c556b195d.tar.gz
kernel-qcow2-linux-08debfb13b199716da6153940c31968c556b195d.tar.xz
kernel-qcow2-linux-08debfb13b199716da6153940c31968c556b195d.zip
usb: host: sl811: use new USB_RESUME_TIMEOUT
Make sure we're using the new macro, so our resume signaling will always pass certification. 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/sl811-hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 4f4ba1ea9e9b..9118cd8de1a7 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1259,7 +1259,7 @@ sl811h_hub_control(
sl811_write(sl811, SL11H_CTLREG1, sl811->ctrl1);
mod_timer(&sl811->timer, jiffies
- + msecs_to_jiffies(20));
+ + msecs_to_jiffies(USB_RESUME_TIMEOUT));
break;
case USB_PORT_FEAT_POWER:
port_power(sl811, 0);