From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 3 Sep 2014 22:34:00 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.10.54~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=677e524a0fe90b70386dc25abf21a09bd8bfcb9a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	usb-fix-build-error-with-config_pm_runtime-disabled.patch
---

diff --git a/queue-3.10/series b/queue-3.10/series
index ca2139d0a68..a8f93ca19aa 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -53,3 +53,4 @@ svcrdma-select-nfsv4.1-backchannel-transport-based-on-forward-channel.patch
 nfsv3-fix-another-acl-regression.patch
 nfsv4-fix-problems-with-close-in-the-presence-of-a-delegation.patch
 vm_is_stack-use-for_each_thread-rather-then-buggy-while_each_thread.patch
+usb-fix-build-error-with-config_pm_runtime-disabled.patch
diff --git a/queue-3.10/usb-fix-build-error-with-config_pm_runtime-disabled.patch b/queue-3.10/usb-fix-build-error-with-config_pm_runtime-disabled.patch
new file mode 100644
index 00000000000..7f9e74488ba
--- /dev/null
+++ b/queue-3.10/usb-fix-build-error-with-config_pm_runtime-disabled.patch
@@ -0,0 +1,37 @@
+From a9ef803d740bfadf5e505fbc57efa57692e27025 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 27 Aug 2014 16:55:29 -0700
+Subject: USB: fix build error with CONFIG_PM_RUNTIME disabled
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit a9ef803d740bfadf5e505fbc57efa57692e27025 upstream.
+
+commit bdd405d2a528 ("usb: hub: Prevent hub autosuspend if
+usbcore.autosuspend is -1") causes a build error if CONFIG_PM_RUNTIME is
+disabled.  Fix that by doing a simple #ifdef guard around it.
+
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Cc: Roger Quadros <rogerq@ti.com>
+Cc: Michael Welling <mwelling@emacinc.com>
+Cc: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/core/hub.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -1703,8 +1703,10 @@ static int hub_probe(struct usb_interfac
+ 	 * - If user has indicated to prevent autosuspend by passing
+ 	 *   usbcore.autosuspend = -1 then keep autosuspend disabled.
+ 	 */
++#ifdef CONFIG_PM_RUNTIME
+ 	if (hdev->dev.power.autosuspend_delay >= 0)
+ 		pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
++#endif
+ 
+ 	/*
+ 	 * Hubs have proper suspend/resume support, except for root hubs