From 556ca678053bb340a81f3404e14c21e42738b492 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Sep 2014 15:34:04 -0700 Subject: [PATCH] 3.14-stable patches added patches: usb-fix-build-error-with-config_pm_runtime-disabled.patch --- queue-3.14/series | 1 + ...rror-with-config_pm_runtime-disabled.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 queue-3.14/usb-fix-build-error-with-config_pm_runtime-disabled.patch diff --git a/queue-3.14/series b/queue-3.14/series index cd7f0ea367b..9515bd7ff85 100644 --- 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 index 00000000000..bf933acae37 --- /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 +Date: Wed, 27 Aug 2014 16:55:29 -0700 +Subject: USB: fix build error with CONFIG_PM_RUNTIME disabled + +From: Greg Kroah-Hartman + +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 +Reported-by: kbuild test robot +Cc: Roger Quadros +Cc: Michael Welling +Cc: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + 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 -- 2.47.3