aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-02-20 22:29:30 +0100
committerFelix Fietkau <nbd@nbd.name>2018-02-20 22:29:32 +0100
commit9595a9e8d398476b1eaa5a541fb2c3bfece34587 (patch)
tree0cfa465a721109d669a79b8c086dcc165df69023
parentc38fb585763f8aba0a019a6ee55363843753d275 (diff)
downloadupstream-9595a9e8d398476b1eaa5a541fb2c3bfece34587.tar.gz
upstream-9595a9e8d398476b1eaa5a541fb2c3bfece34587.tar.bz2
upstream-9595a9e8d398476b1eaa5a541fb2c3bfece34587.zip
kernel: fix return value of usb_xhci_needs_pci_reset
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch7
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
index 9bbbaf87ea..410a267597 100644
--- a/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch
@@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
int usb_amd_find_chipset_info(void);
int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev);
bool usb_amd_hang_symptom_quirk(void);
-@@ -19,12 +22,26 @@ void sb800_prefetch(struct device *dev,
+@@ -19,12 +22,29 @@ void sb800_prefetch(struct device *dev,
bool usb_xhci_needs_pci_reset(struct pci_dev *pdev);
#else
struct pci_dev;
@@ -88,7 +88,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {}
static inline void sb800_prefetch(struct device *dev, int on) {}
+static inline void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev) {}
-+static inline bool usb_xhci_needs_pci_reset(struct pci_dev *pdev) {}
++static inline bool usb_xhci_needs_pci_reset(struct pci_dev *pdev)
++{
++ return false;
++}
#endif /* CONFIG_USB_PCI */
#endif /* __LINUX_USB_PCI_QUIRKS_H */