Commit 9d892429 authored Aug 30, 2013 by Alan Stern Committed by Greg Kroah-Hartman Aug 30, 2013

USB: fix build error when CONFIG_PM_SLEEP isn't enabled



This patch fixes a build error that occurs when CONFIG_PM is enabled
and CONFIG_PM_SLEEP isn't:

>> drivers/usb/host/ohci-pci.c:294:10: error: 'usb_hcd_pci_pm_ops' undeclared here (not in a function)
      .pm = &usb_hcd_pci_pm_ops

Since the usb_hcd_pci_pm_ops structure is defined and used when
CONFIG_PM is enabled, its declaration should not be protected by
CONFIG_PM_SLEEP.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9b1b0162

include/linux/usb/hcd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -428,7 +428,7 @@ extern int usb_hcd_pci_probe(struct pci_dev *dev,
		extern void usb_hcd_pci_remove(struct pci_dev *dev);
		extern void usb_hcd_pci_shutdown(struct pci_dev *dev);

		#ifdef CONFIG_PM_SLEEP
		#ifdef CONFIG_PM
		extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
		#endif
		#endif /* CONFIG_PCI */

Admin message