diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:44:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-17 16:44:04 +0000 |
| commit | daae0b7c938c6fe4c5818f14e2321fa97bd27965 (patch) | |
| tree | 5066a9084aaebd745d65859127676d424295bdd1 | |
| parent | 5e0bd41bbe339cbd64948b72a2ccbdfa611a3f66 (diff) | |
| download | upstream-daae0b7c938c6fe4c5818f14e2321fa97bd27965.tar.gz upstream-daae0b7c938c6fe4c5818f14e2321fa97bd27965.tar.bz2 upstream-daae0b7c938c6fe4c5818f14e2321fa97bd27965.zip | |
kernel/3.1{3, 4}: fix AMD USB HDC wakeup quirk disabling
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
| -rw-r--r-- | target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch | 17 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch index 359c631342..9fe134eea3 100644 --- a/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.13/811-pci_disable_usb_common_quirks.patch @@ -82,3 +82,20 @@ +#endif #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; diff --git a/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch index b85ac69580..4c8ee4a7e0 100644 --- a/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch @@ -82,3 +82,20 @@ +#endif #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; |