lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 100/180] usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
    Date
    3.16.7-ckt11 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Felipe Balbi <balbi@ti.com>

    commit 84c0d178eb9f3a3ae4d63dc97a440266cf17f7f5 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>
    [ luis: backported to 3.16:
    - replaced 'hub_wq' by 'khubd' in comment ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/host/oxu210hp-hcd.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
    index e07248b6ab67..8a0158667166 100644
    --- a/drivers/usb/host/oxu210hp-hcd.c
    +++ b/drivers/usb/host/oxu210hp-hcd.c
    @@ -2500,11 +2500,12 @@ static irqreturn_t oxu210_hcd_irq(struct usb_hcd *hcd)
    || oxu->reset_done[i] != 0)
    continue;

    - /* start 20 msec resume signaling from this port,
    - * and make khubd collect PORT_STAT_C_SUSPEND to
    + /* start USB_RESUME_TIMEOUT resume signaling from this
    + * port, and make khubd collect PORT_STAT_C_SUSPEND to
    * stop that signaling.
    */
    - oxu->reset_done[i] = jiffies + msecs_to_jiffies(20);
    + oxu->reset_done[i] = jiffies +
    + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    oxu_dbg(oxu, "port %d remote wakeup\n", i + 1);
    mod_timer(&hcd->rh_timer, oxu->reset_done[i]);
    }

    \
     
     \ /
      Last update: 2015-05-07 12:41    [W:2.742 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site