KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel/3.1{3, 4}: fix AMD USB HDC wakeup quirk disabling

Browse source 
Declare inline placeholder when usb_hcd_amd_remote_wakeup_quirk() not
compiled due CONFIG_PCI_DISABLE_COMMON_QUIRKS.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41702
This commit is contained in:
Felix Fietkau 2014-07-17 16:44:04 +00:00
parent 5e0bd41bbe
commit daae0b7c93
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch
View file

@ -82,3 +82,20 @@
+#endif +#endif
#endif /* __LINUX_USB_PCI_QUIRKS_H */ #endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -436,7 +436,14 @@ extern int usb_hcd_pci_probe(struct pci_
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
+#else
+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
+{
+ return 0;
+}
+#endif
#ifdef CONFIG_PM
extern const struct dev_pm_ops usb_hcd_pci_pm_ops;

17
target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch
View file

@ -82,3 +82,20 @@
+#endif +#endif
#endif /* __LINUX_USB_PCI_QUIRKS_H */ #endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -439,7 +439,14 @@ extern int usb_hcd_pci_probe(struct pci_
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
+#else
+static inline int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev)
+{
+ return 0;
+}
+#endif
#ifdef CONFIG_PM
extern const struct dev_pm_ops usb_hcd_pci_pm_ops;