[openwrt/openwrt] kernel: fix return value of usb_xhci_needs_pci_reset

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 20 13:31:43 PST 2018


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/9595a9e8d398476b1eaa5a541fb2c3bfece34587

commit 9595a9e8d398476b1eaa5a541fb2c3bfece34587
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Feb 20 22:29:30 2018 +0100

    kernel: fix return value of usb_xhci_needs_pci_reset
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../generic/pending-4.14/811-pci_disable_usb_common_quirks.patch   | 7 +++++--
 1 file 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 9bbbaf8..410a267 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 at 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 at 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  */



More information about the lede-commits mailing list