From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 10 Dec 2012 15:03:51 +0000 (+0000)
Subject: kernel/generic: port r34599 over 3.7 kernel
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f90806014d62adfeec6f2b33992e1d7f831bcd3;p=openwrt%2Fstaging%2Fjow.git

kernel/generic: port r34599 over 3.7 kernel

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

SVN-Revision: 34600
---

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);