diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:39:42 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:29:32 +0100 |
commit | f80272dd9c40dae4aeff38fa5c7132a0f5fc198c (patch) | |
tree | f67e8c7c33caf3eb39fceaa545472e4cc204388e /target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch | |
parent | 3030abfa7e9ac73ee54b4ac9e9a784775001d750 (diff) | |
download | upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.gz upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.tar.bz2 upstream-f80272dd9c40dae4aeff38fa5c7132a0f5fc198c.zip |
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>
Diffstat (limited to 'target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch')
-rw-r--r-- | target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch b/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch index e0dbffe303..31c686d561 100644 --- a/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/804-i2c-support-layerscape.patch @@ -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); |