diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:03:51 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-10 15:03:51 +0000 |
| commit | 4af994b14b5f835d324a1bc2f1684eb19850cce6 (patch) | |
| tree | f7f82fd4ed8a3ab062a34e552d868ef125b543e2 /target/linux/generic/patches-3.7 | |
| parent | 8813a709a00e1804b7b8e3049b083f3524acc158 (diff) | |
kernel/generic: port r34599 over 3.7 kernel
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34600 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7')
| -rw-r--r-- | target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch index 56d4743df1..384c7f8cc4 100644 --- a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch @@ -21,18 +21,30 @@ /* * Make sure the controller is completely inactive, unable to * 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); -+#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 + - 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; -@@ -971,3 +981,4 @@ static void __devinit quirk_usb_early_ha + return pci_resource_start(pdev, idx) && mmio_enabled(pdev); +@@ -971,3 +986,4 @@ static void __devinit quirk_usb_early_ha } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); |