CC: upgrade kernel to 3.18.68

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 811-pci_disable_usb_common_quirks.patch

diff --git a/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch
index a7bf0bb..d1da506 100644 (file)
--- a/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.18/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
 
 --- a/drivers/usb/host/pci-quirks.c
 +++ b/drivers/usb/host/pci-quirks.c

-@@ -97,6 +97,8 @@ struct amd_chipset_type {
+@@ -98,6 +98,8 @@ struct amd_chipset_type {

        u8 rev;
  };
  
        u8 rev;
  };
  


@@ -10,7 +10,7 @@
  static struct amd_chipset_info {
        struct pci_dev  *nb_dev;
        struct pci_dev  *smbus_dev;
  static struct amd_chipset_info {
        struct pci_dev  *nb_dev;
        struct pci_dev  *smbus_dev;

-@@ -454,6 +456,10 @@ void usb_amd_dev_put(void)
+@@ -461,6 +463,10 @@ void usb_amd_dev_put(void)

  }
  EXPORT_SYMBOL_GPL(usb_amd_dev_put);
  
  }
  EXPORT_SYMBOL_GPL(usb_amd_dev_put);
  


@@ -21,7 +21,7 @@
  /*
   * Make sure the controller is completely inactive, unable to
   * generate interrupts or do DMA.
  /*
   * Make sure the controller is completely inactive, unable to
   * generate interrupts or do DMA.

-@@ -533,8 +539,17 @@ reset_needed:
+@@ -540,8 +546,17 @@ reset_needed:

        uhci_reset_hc(pdev, base);
        return 1;
  }
        uhci_reset_hc(pdev, base);
        return 1;
  }


@@ -39,7 +39,7 @@
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;

-@@ -1095,3 +1110,4 @@ static void quirk_usb_early_handoff(stru
+@@ -1102,3 +1117,4 @@ static void quirk_usb_early_handoff(stru

  }
  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
                        PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
  }
  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
                        PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);