This is a note to let you know that I've just added the patch titled
usb: musb: use new USB_RESUME_TIMEOUT
to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-musb-use-new-usb_resume_timeout.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 309be239369609929d5d3833ee043f7c5afc95d1 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@xxxxxx>
Date: Fri, 13 Feb 2015 14:46:27 -0600
Subject: usb: musb: use new USB_RESUME_TIMEOUT
From: Felipe Balbi <balbi@xxxxxx>
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@xxxxxx>>
Cc: Bin Liu <b-liu@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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));
}
}
Patches currently in stable-queue which might be from balbi@xxxxxx are
queue-3.19/usb-host-xhci-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-sl811-use-new-usb_resume_timeout.patch
queue-3.19/usb-musb-use-new-usb_resume_timeout.patch
queue-3.19/usb-define-a-generic-usb_resume_timeout-macro.patch
queue-3.19/usb-host-oxu210hp-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-isp116x-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-r8a66597-use-new-usb_resume_timeout.patch
queue-3.19/usb-musb-core-fix-tx-rx-endpoint-order.patch
queue-3.19/usb-core-hub-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-fusbh200-use-new-usb_resume_timeout.patch
queue-3.19/usb-gadget-printer-enqueue-printer-s-response-for-setup-request.patch
queue-3.19/usb-host-ehci-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-uhci-use-new-usb_resume_timeout.patch
queue-3.19/usb-host-fotg210-use-new-usb_resume_timeout.patch
queue-3.19/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html