3.14-stable patches

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

diff --git a/queue-3.14/series b/queue-3.14/series
index cd7f0ea367b7c51a1a109dc50f86706a40faa7fd..9515bd7ff85d56f189a680fe0c38cbbe70efbfb4 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -86,3 +86,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.14/usb-fix-build-error-with-config_pm_runtime-disabled.patch b/queue-3.14/usb-fix-build-error-with-config_pm_runtime-disabled.patch
new file mode 100644 (file)
index 0000000..bf933ac
--- /dev/null
+++ b/queue-3.14/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
+@@ -1699,8 +1699,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