aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-05 11:06:09 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-06 11:56:18 +0200
commit2807f84b629c1a05304e4b39447973084889d9de (patch)
tree714c62e3e670a277753d287dee233f571b649416 /target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
parent7e4ce0c655ef61e2ba80e1605362f132b5678d27 (diff)
downloadupstream-2807f84b629c1a05304e4b39447973084889d9de.tar.gz
upstream-2807f84b629c1a05304e4b39447973084889d9de.tar.bz2
upstream-2807f84b629c1a05304e4b39447973084889d9de.zip
kernel: bump 4.9 to 4.9.187
Refreshed all patches. Altered patches: - 021-bridge-multicast-to-unicast.patch Remove upstreamed: - 001-um-Allow-building-and-running-on-older-hosts.patch - 003-um-Fix-check-for-_xstate-for-older-hosts.patch Fixes: - CVE-2019-10207 - CVE-2019-13648 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch')
-rw-r--r--target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
index 9dbb2ca8cd..6c8178d187 100644
--- a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static struct amd_chipset_info {
struct pci_dev *nb_dev;
struct pci_dev *smbus_dev;
-@@ -511,6 +513,10 @@ void usb_amd_dev_put(void)
+@@ -518,6 +520,10 @@ void usb_amd_dev_put(void)
}
EXPORT_SYMBOL_GPL(usb_amd_dev_put);
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA.
-@@ -590,8 +596,17 @@ reset_needed:
+@@ -597,8 +603,17 @@ reset_needed:
uhci_reset_hc(pdev, base);
return 1;
}
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -1158,3 +1173,4 @@ static void quirk_usb_early_handoff(stru
+@@ -1165,3 +1180,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);