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 068/177] usb: musb: 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 309be239369609929d5d3833ee043f7c5afc95d1 upstream.

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

    Based on original work by Bin Liu <Bin Liu <b-liu@ti.com>>

    Cc: Bin Liu <b-liu@ti.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/musb/musb_core.c | 5 +++--
    drivers/usb/musb/musb_virthub.c | 2 +-
    2 files changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/usb/musb/musb_core.c
    +++ b/drivers/usb/musb/musb_core.c
    @@ -99,6 +99,7 @@
    #include <linux/platform_device.h>
    #include <linux/io.h>
    #include <linux/dma-mapping.h>
    +#include <linux/usb.h>

    #include "musb_core.h"

    @@ -562,7 +563,7 @@ static irqreturn_t musb_stage0_irq(struc
    (USB_PORT_STAT_C_SUSPEND << 16)
    | MUSB_PORT_STAT_RESUME;
    musb->rh_timer = jiffies
    - + msecs_to_jiffies(20);
    + + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    musb->need_finish_resume = 1;

    musb->xceiv->otg->state = OTG_STATE_A_HOST;
    @@ -2468,7 +2469,7 @@ static int musb_resume(struct device *de
    if (musb->need_finish_resume) {
    musb->need_finish_resume = 0;
    schedule_delayed_work(&musb->finish_resume_work,
    - msecs_to_jiffies(20));
    + msecs_to_jiffies(USB_RESUME_TIMEOUT));
    }

    /*
    --- a/drivers/usb/musb/musb_virthub.c
    +++ b/drivers/usb/musb/musb_virthub.c
    @@ -137,7 +137,7 @@ void musb_port_suspend(struct musb *musb
    /* later, GetPortStatus will stop RESUME signaling */
    musb->port1_status |= MUSB_PORT_STAT_RESUME;
    schedule_delayed_work(&musb->finish_resume_work,
    - msecs_to_jiffies(20));
    + msecs_to_jiffies(USB_RESUME_TIMEOUT));
    }
    }




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