diff options
Diffstat (limited to 'target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch index 7bf8eaf1e..6debec9c8 100644 --- a/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.6/811-pci_disable_usb_common_quirks.patch @@ -1,7 +1,7 @@ --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c -@@ -432,6 +432,8 @@ reset_needed: +@@ -434,6 +434,8 @@ reset_needed: } EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); @@ -10,29 +10,8 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -928,3 +930,5 @@ static void __devinit quirk_usb_early_ha - pci_disable_device(pdev); +@@ -964,3 +966,4 @@ static void __devinit quirk_usb_early_ha } - DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff); -+ -+#endif ---- a/drivers/usb/host/pci-quirks.h -+++ b/drivers/usb/host/pci-quirks.h -@@ -8,9 +8,17 @@ int usb_amd_find_chipset_info(void); - void usb_amd_dev_put(void); - void usb_amd_quirk_pll_disable(void); - void usb_amd_quirk_pll_enable(void); -+#if !defined(CONFIG_PCI_DISABLE_COMMON_QUIRKS) - bool usb_is_intel_switchable_xhci(struct pci_dev *pdev); - void usb_enable_xhci_ports(struct pci_dev *xhci_pdev); - #else -+static inline bool usb_is_intel_switchable_xhci(struct pci_dev *pdev) -+{ -+ return false; -+} -+static inline void usb_enable_xhci_ports(struct pci_dev *xhci_pdev) {} + DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, + PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); +#endif -+#else - static inline void usb_amd_quirk_pll_disable(void) {} - static inline void usb_amd_quirk_pll_enable(void) {} - static inline void usb_amd_dev_put(void) {} |