kernel: bump 4.14 to 4.14.159
Refreshed all patches. Remove upstreamed: - 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
committed by
Hauke Mehrtens
parent
3030abfa7e
commit
f80272dd9c
@@ -336,7 +336,7 @@ Signed-off-by: Zhang Ying-22455 <ying.zhang22455@nxp.com>
|
||||
/* Get I2C clock */
|
||||
i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(i2c_imx->clk)) {
|
||||
@@ -1103,7 +1301,8 @@ static int i2c_imx_probe(struct platform
|
||||
@@ -1104,7 +1302,8 @@ static int i2c_imx_probe(struct platform
|
||||
pdev->name, i2c_imx);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "can't claim irq %d\n", irq);
|
||||
@@ -346,7 +346,7 @@ Signed-off-by: Zhang Ying-22455 <ying.zhang22455@nxp.com>
|
||||
}
|
||||
|
||||
/* Init queue */
|
||||
@@ -1150,25 +1349,31 @@ static int i2c_imx_probe(struct platform
|
||||
@@ -1151,25 +1350,31 @@ static int i2c_imx_probe(struct platform
|
||||
pm_runtime_mark_last_busy(&pdev->dev);
|
||||
pm_runtime_put_autosuspend(&pdev->dev);
|
||||
|
||||
|
||||
@@ -382,7 +382,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
|
||||
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
|
||||
dwc->tx_de_emphasis = tx_de_emphasis;
|
||||
|
||||
@@ -1367,12 +1532,14 @@ static int dwc3_resume_common(struct dwc
|
||||
@@ -1368,12 +1533,14 @@ static int dwc3_resume_common(struct dwc
|
||||
|
||||
switch (dwc->dr_mode) {
|
||||
case USB_DR_MODE_PERIPHERAL:
|
||||
@@ -1340,7 +1340,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
|
||||
while (ep_ring->dequeue != td->last_trb)
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -1607,13 +1607,38 @@ static int xhci_urb_dequeue(struct usb_h
|
||||
@@ -1604,13 +1604,38 @@ static int xhci_urb_dequeue(struct usb_h
|
||||
ret = -ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user