]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: host: fusbh200: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 20:55:34 +0000 (14:55 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:01:50 +0000 (22:01 +0200)
commit 595227db1f2d98bfc33f02a55842f268e12b247d upstream.

Make sure we're using the new macro, so our
resume signaling will always pass certification.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/fusbh200-hcd.c

index 664d2aa1239cc22526c3da4a92805acb0dffd9b8..c9eb18b9973cd03a97b550ac5a7bfb852dce483f 100644 (file)
@@ -1550,10 +1550,9 @@ static int fusbh200_hub_control (
                        if ((temp & PORT_PE) == 0)
                                goto error;
 
-                       /* resume signaling for 20 msec */
                        fusbh200_writel(fusbh200, temp | PORT_RESUME, status_reg);
                        fusbh200->reset_done[wIndex] = jiffies
-                                       + msecs_to_jiffies(20);
+                                       + msecs_to_jiffies(USB_RESUME_TIMEOUT);
                        break;
                case USB_PORT_FEAT_C_SUSPEND:
                        clear_bit(wIndex, &fusbh200->port_c_suspend);