3.10-stable patches

added patches:
	usb-dwc3-omap-fix-ordering-for-runtime-pm-calls.patch
	usb-hub-set-hub-change_bits-when-over-current-happens.patch

diff --git a/queue-3.10/series b/queue-3.10/series
index 08aca23abcc1b8926bdf3848516933fa0c016920..b53b7c37977bb5931568c58cb99e451e6109cd0c 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -57,3 +57,5 @@ usb-storage-add-quirk-for-adaptec-usbconnect-2000-usb-to-scsi-adapter.patch
 usb-storage-add-quirk-for-ariston-technologies-iconnect-usb-to-scsi-adapter.patch
 usb-storage-add-quirks-for-entrega-xircom-usb-to-scsi-converters.patch
 usb-ehci-unlink-qhs-even-after-the-controller-has-stopped.patch
+usb-dwc3-omap-fix-ordering-for-runtime-pm-calls.patch
+usb-hub-set-hub-change_bits-when-over-current-happens.patch

diff --git a/queue-3.10/usb-dwc3-omap-fix-ordering-for-runtime-pm-calls.patch b/queue-3.10/usb-dwc3-omap-fix-ordering-for-runtime-pm-calls.patch
new file mode 100644 (file)
index 0000000..ac99b90
--- /dev/null
+++ b/queue-3.10/usb-dwc3-omap-fix-ordering-for-runtime-pm-calls.patch
@@ -0,0 +1,33 @@
+From 81a60b7f5c143ab3cdcd9943c9b4b7c63c32fc31 Mon Sep 17 00:00:00 2001
+From: Felipe Balbi <balbi@ti.com>
+Date: Wed, 3 Sep 2014 16:42:57 -0500
+Subject: usb: dwc3: omap: fix ordering for runtime pm calls
+
+From: Felipe Balbi <balbi@ti.com>
+
+commit 81a60b7f5c143ab3cdcd9943c9b4b7c63c32fc31 upstream.
+
+we don't to gate clocks until our children are
+done with their remove path.
+
+Fixes: af310e9 (usb: dwc3: omap: use runtime API's to enable clocks)
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/dwc3/dwc3-omap.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/dwc3/dwc3-omap.c
++++ b/drivers/usb/dwc3/dwc3-omap.c
+@@ -395,9 +395,9 @@ static int dwc3_omap_remove(struct platf
+       struct dwc3_omap        *omap = platform_get_drvdata(pdev);
+ 
+       dwc3_omap_disable_irqs(omap);
++      device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);
+       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
+-      device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);
+ 
+       return 0;
+ }

diff --git a/queue-3.10/usb-hub-set-hub-change_bits-when-over-current-happens.patch b/queue-3.10/usb-hub-set-hub-change_bits-when-over-current-happens.patch
new file mode 100644 (file)
index 0000000..c2c482d
--- /dev/null
+++ b/queue-3.10/usb-hub-set-hub-change_bits-when-over-current-happens.patch
@@ -0,0 +1,41 @@
+From 08d1dec6f4054e3613f32051d9b149d4203ce0d2 Mon Sep 17 00:00:00 2001
+From: Shen Guang <shenguang10@gmail.com>
+Date: Wed, 8 Jan 2014 14:45:42 +0800
+Subject: usb:hub set hub->change_bits when over-current happens
+
+From: Shen Guang <shenguang10@gmail.com>
+
+commit 08d1dec6f4054e3613f32051d9b149d4203ce0d2 upstream.
+
+When we are doing compliance test with xHCI, we found that if we
+enable CONFIG_USB_SUSPEND and plug in a bad device which causes
+over-current condition to the root port, software will not be noticed.
+The reason is that current code don't set hub->change_bits in
+hub_activate() when over-current happens, and then hub_events() will
+not check the port status because it thinks nothing changed.
+If CONFIG_USB_SUSPEND is disabled, the interrupt pipe of the hub will
+report the change and set hub->event_bits, and then hub_events() will
+check what events happened.In this case over-current can be detected.
+
+Signed-off-by: Shen Guang <shenguang10@gmail.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Acked-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Cc: Frans Klaver <fransklaver@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/core/hub.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -1165,7 +1165,8 @@ static void hub_activate(struct usb_hub
+                       /* Tell khubd to disconnect the device or
+                        * check for a new connection
+                        */
+-                      if (udev || (portstatus & USB_PORT_STAT_CONNECTION))
++                      if (udev || (portstatus & USB_PORT_STAT_CONNECTION) ||
++                          (portstatus & USB_PORT_STAT_OVERCURRENT))
+                               set_bit(port1, hub->change_bits);
+ 
+               } else if (portstatus & USB_PORT_STAT_ENABLE) {