This is a note to let you know that I've just added the patch titled
USB: fix build error with CONFIG_PM_RUNTIME disabled
to the 3.10-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-fix-build-error-with-config_pm_runtime-disabled.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a9ef803d740bfadf5e505fbc57efa57692e27025 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 27 Aug 2014 16:55:29 -0700
Subject: USB: fix build error with CONFIG_PM_RUNTIME disabled
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
Cc: Roger Quadros <rogerq@xxxxxx>
Cc: Michael Welling <mwelling@xxxxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-3.10/hwmon-sis5595-prevent-overflow-problem-when-writing-large-limits.patch
queue-3.10/alsa-hda-realtek-avoid-setting-wrong-coef-on-alc269-co.patch
queue-3.10/crypto-ux500-make-interrupt-mode-plausible.patch
queue-3.10/kvm-nvmx-fix-acknowledge-interrupt-on-exit-when-apicv-is-in-use.patch
queue-3.10/usb-fix-build-error-with-config_pm_runtime-disabled.patch
queue-3.10/mei-nfc-fix-memory-leak-in-error-path.patch
queue-3.10/usb-ohci-don-t-lose-track-of-eds-when-a-controller-dies.patch
queue-3.10/hpsa-fix-bad-enomem-return-value-in-hpsa_big_passthru_ioctl.patch
queue-3.10/hid-fix-a-couple-of-off-by-ones.patch
queue-3.10/drm-radeon-add-additional-si-pci-ids.patch
queue-3.10/usb-serial-ftdi_sio-annotate-the-current-xsens-pid-assignments.patch
queue-3.10/x86_64-vsyscall-fix-warn_bad_vsyscall-log-output.patch
queue-3.10/hwmon-ads1015-fix-off-by-one-for-valid-channel-index-checking.patch
queue-3.10/nfsv4-fix-problems-with-close-in-the-presence-of-a-delegation.patch
queue-3.10/usb-ftdi_sio-add-basic-micro-atom-nano-usb2serial-pid.patch
queue-3.10/serial-core-preserve-termios-c_cflag-for-console-resume.patch
queue-3.10/kvm-iommu-fix-the-third-parameter-of-kvm_iommu_put_pages-cve-2014-3601.patch
queue-3.10/usb-ehci-pci-usb-host-controller-support-for-intel-quark-x1000.patch
queue-3.10/nfsd-decrease-nfsd_users-in-nfsd_startup_generic-fail.patch
queue-3.10/alsa-hda-fix-an-external-mic-jack-problem-on-a-hp-machine.patch
queue-3.10/xhci-treat-not-finding-the-event_seg-on-comp_stop-the-same-as-comp_stop_inval.patch
queue-3.10/ext4-fix-ext4_discard_allocated_blocks-if-we-can-t-allocate-the-pa-struct.patch
queue-3.10/hwmon-lm78-fix-overflow-problems-seen-when-writing-large-temperature-limits.patch
queue-3.10/staging-speakup-update-__speakup_paste_selection-tty-ab-usage-to-match-vt.patch
queue-3.10/mei-reset-client-state-on-queued-connect-request.patch
queue-3.10/alsa-virtuoso-add-xonar-essence-stx-ii-support.patch
queue-3.10/btrfs-fix-csum-tree-corruption-duplicate-and-outdated-checksums.patch
queue-3.10/arm-omap3-fix-choice-of-omap3_restore_es-function-in-omap34xx-rev3.1.2-case.patch
queue-3.10/hwmon-gpio-fan-prevent-overflow-problem-when-writing-large-limits.patch
queue-3.10/ext4-fix-bug_on-in-mb_free_blocks.patch
queue-3.10/hid-logitech-perform-bounds-checking-on-device_id-early-enough.patch
queue-3.10/kvm-x86-always-exit-on-eois-for-interrupts-listed-in-the-ioapic-redir-table.patch
queue-3.10/kvm-x86-inter-privilege-level-ret-emulation-is-not-implemeneted.patch
queue-3.10/mei-start-disconnect-request-timer-consistently.patch
queue-3.10/alsa-hda-ca0132-don-t-try-loading-firmware-at-resume-when-already-failed.patch
queue-3.10/revert-kvm-x86-increase-the-number-of-fixed-mtrr-regs-to-10.patch
queue-3.10/usb-xhci-amd-chipset-also-needs-short-tx-quirk.patch
queue-3.10/hwmon-ads1015-fix-out-of-bounds-array-access.patch
queue-3.10/drm-omapdrm-fix-compiler-errors.patch
queue-3.10/usb-hub-prevent-hub-autosuspend-if-usbcore.autosuspend-is-1.patch
queue-3.10/hwmon-dme1737-prevent-overflow-problem-when-writing-large-limits.patch
queue-3.10/usb-serial-ftdi_sio-add-support-for-new-xsens-devices.patch
queue-3.10/usb-whiteheat-added-bounds-checking-for-bulk-command-response.patch
queue-3.10/arm-omap2-hwmod-rearm-wake-up-interrupts-for-dt-when-musb-is-idled.patch
queue-3.10/drivers-i2c-busses-use-correct-type-for-dma_map-unmap.patch
queue-3.10/vm_is_stack-use-for_each_thread-rather-then-buggy-while_each_thread.patch
queue-3.10/stable_kernel_rules-add-pointer-to-netdev-faq-for-network-patches.patch
queue-3.10/jbd2-fix-infinite-loop-when-recovering-corrupt-journal-blocks.patch
queue-3.10/nfsv3-fix-another-acl-regression.patch
queue-3.10/svcrdma-select-nfsv4.1-backchannel-transport-based-on-forward-channel.patch
queue-3.10/usb-fix-persist-resume-of-some-ss-usb-devices.patch
queue-3.10/x86-efi-enforce-config_relocatable-for-efi-boot-stub.patch
queue-3.10/hwmon-lm85-fix-various-errors-on-attribute-writes.patch
queue-3.10/usb-ftdi_sio-added-pid-for-new-ekey-device.patch
queue-3.10/isofs-fix-unbounded-recursion-when-processing-relocated-directories.patch
queue-3.10/x86-don-t-exclude-low-bios-area-when-allocating-address-space-for-non-pci-cards.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