aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-09-16 16:41:48 -0700
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-18 02:08:18 +0300
commitbb83c9dcca9d7080a704e8a04a58ef37e11681fd (patch)
tree0b6f2bace2bed4b442c6b16fc206458715288257 /target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch
parent2375e279a7cb462d62fd6028cb3fbd56217222de (diff)
downloadupstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.gz
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.bz2
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.zip
kernel: update to 3.18.71
Delete a bunch of fixes that are already included. Refresh patches. Compile-tested on malta/mipsel Runtime-tested on malta/mipsel Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch')
-rw-r--r--target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch
index a7bf0bb9fa..ddc8549634 100644
--- a/target/linux/generic/pending-3.18/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/pending-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
-@@ -97,6 +97,8 @@ struct amd_chipset_type {
+@@ -98,6 +98,8 @@ struct amd_chipset_type {
u8 rev;
};
@@ -10,7 +10,7 @@
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)
+@@ -462,6 +464,10 @@ void usb_amd_dev_put(void)
}
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.
-@@ -533,8 +539,17 @@ reset_needed:
+@@ -541,8 +547,17 @@ reset_needed:
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;
-@@ -1095,3 +1110,4 @@ static void quirk_usb_early_handoff(stru
+@@ -1103,3 +1118,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);