summaryrefslogtreecommitdiff
path: root/target/linux/apm821xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-01-06 02:08:42 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-07 13:37:04 +0100
commit7f5a040359cf227bc54d2ef553d469f85ed413e2 (patch)
treec0d693d96a58dd0c7b41f829f72f27a30de5d3d1 /target/linux/apm821xx
parentddedcb19e52909b9de851bcdad500656069046b5 (diff)
downloadmtk-20170518-7f5a040359cf227bc54d2ef553d469f85ed413e2.zip
mtk-20170518-7f5a040359cf227bc54d2ef553d469f85ed413e2.tar.gz
mtk-20170518-7f5a040359cf227bc54d2ef553d469f85ed413e2.tar.bz2
kernel: update kernel 4.4 to version 4.4.110
This fixes: CVE-2017-5754 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/apm821xx')
-rw-r--r--target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch6
-rw-r--r--target/linux/apm821xx/patches-4.4/802-usb-xhci-force-msi-renesas-xhci.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
index e25e15b..91c5c1f 100644
--- a/target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
+++ b/target/linux/apm821xx/patches-4.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
#include "xhci.h"
#include "xhci-trace.h"
-@@ -224,6 +226,458 @@ static void xhci_pme_acpi_rtd3_enable(st
+@@ -227,6 +229,458 @@ static void xhci_pme_acpi_rtd3_enable(st
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
#endif /* CONFIG_ACPI */
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
/* called during probe() after chip reset completes */
static int xhci_pci_setup(struct usb_hcd *hcd)
{
-@@ -263,6 +717,22 @@ static int xhci_pci_probe(struct pci_dev
+@@ -266,6 +720,22 @@ static int xhci_pci_probe(struct pci_dev
struct hc_driver *driver;
struct usb_hcd *hcd;
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
driver = (struct hc_driver *)id->driver_data;
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
-@@ -320,6 +790,16 @@ static void xhci_pci_remove(struct pci_d
+@@ -323,6 +793,16 @@ static void xhci_pci_remove(struct pci_d
{
struct xhci_hcd *xhci;
diff --git a/target/linux/apm821xx/patches-4.4/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.4/802-usb-xhci-force-msi-renesas-xhci.patch
index c34108e..ee56eb3 100644
--- a/target/linux/apm821xx/patches-4.4/802-usb-xhci-force-msi-renesas-xhci.patch
+++ b/target/linux/apm821xx/patches-4.4/802-usb-xhci-force-msi-renesas-xhci.patch
@@ -13,8 +13,8 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -188,7 +188,7 @@ static void xhci_pci_quirks(struct devic
- }
+@@ -191,7 +191,7 @@ static void xhci_pci_quirks(struct devic
+ xhci->quirks |= XHCI_TRUST_TX_LENGTH;
if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
pdev->device == 0x0015)
- xhci->quirks |= XHCI_RESET_ON_RESUME;