hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel/generic: port r34599 over 3.7 kernel 

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34600
owl
Florian Fainelli 2012-12-10 15:03:51 +00:00
parent 67e85c0018
commit 0f90806014
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
View File

@ -21,18 +21,30 @@
/* /*
* Make sure the controller is completely inactive, unable to * Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA. * generate interrupts or do DMA.
@@ -434,6 +440,10 @@ reset_needed: @@ -432,6 +438,13 @@ reset_needed:
uhci_reset_hc(pdev, base);
return 1;
} }
+#else
+int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base)
+{
+ return 0;
+}
+
+#endif
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
+#endif static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
+ @@ -461,6 +474,8 @@ static void __devinit quirk_usb_handoff_
uhci_check_and_reset_hc(pdev, base);
}
+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ +
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)
{ {
u16 cmd; return pci_resource_start(pdev, idx) && mmio_enabled(pdev);
@@ -971,3 +981,4 @@ static void __devinit quirk_usb_early_ha @@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha
} }
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);