lkml.org 
[lkml]   [2015]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 100/142] usb: musb: use new USB_RESUME_TIMEOUT
    Date
    From: Felipe Balbi <balbi@ti.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/musb/musb_core.c | 3 ++-
    drivers/usb/musb/musb_virthub.c | 2 +-
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
    index 7c0c9335a0d9..3a63ec105045 100644
    --- a/drivers/usb/musb/musb_core.c
    +++ b/drivers/usb/musb/musb_core.c
    @@ -100,6 +100,7 @@
    #include <linux/platform_device.h>
    #include <linux/io.h>
    #include <linux/dma-mapping.h>
    +#include <linux/usb.h>

    #include "musb_core.h"

    @@ -478,7 +479,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
    (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->xceiv->state = OTG_STATE_A_HOST;
    musb->is_active = 1;
    diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
    index 9af6bba5eac9..5448125eda5a 100644
    --- a/drivers/usb/musb/musb_virthub.c
    +++ b/drivers/usb/musb/musb_virthub.c
    @@ -105,7 +105,7 @@ static void musb_port_suspend(struct musb *musb, bool do_suspend)

    /* later, GetPortStatus will stop RESUME signaling */
    musb->port1_status |= MUSB_PORT_STAT_RESUME;
    - musb->rh_timer = jiffies + msecs_to_jiffies(20);
    + musb->rh_timer = jiffies + msecs_to_jiffies(USB_RESUME_TIMEOUT);
    }
    }

    --
    2.3.7


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