lkml.org 
[lkml]   [2015]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 071/177] usb: host: uhci: use new USB_RESUME_TIMEOUT
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felipe Balbi <balbi@ti.com>

    commit b8fb6f79f76f478acbbffccc966daa878f172a0a 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/uhci-hub.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/usb/host/uhci-hub.c
    +++ b/drivers/usb/host/uhci-hub.c
    @@ -165,7 +165,7 @@ static void uhci_check_ports(struct uhci
    /* Port received a wakeup request */
    set_bit(port, &uhci->resuming_ports);
    uhci->ports_timeout = jiffies +
    - msecs_to_jiffies(25);
    + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    usb_hcd_start_port_resume(
    &uhci_to_hcd(uhci)->self, port);

    @@ -337,7 +337,8 @@ static int uhci_hub_control(struct usb_h
    uhci_finish_suspend(uhci, port, port_addr);

    /* USB v2.0 7.1.7.5 */
    - uhci->ports_timeout = jiffies + msecs_to_jiffies(50);
    + uhci->ports_timeout = jiffies +
    + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    break;
    case USB_PORT_FEAT_POWER:
    /* UHCI has no power switching */



    \
     
     \ /
      Last update: 2015-05-02 22:01    [W:4.164 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site