diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-06-29 22:29:06 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-07-02 07:06:23 +0200 |
| commit | ab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch) | |
| tree | 791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch | |
| parent | c96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff) | |
| download | mtk-20170518-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip mtk-20170518-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz mtk-20170518-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2 | |
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64.
Run-tested on: ramips/mt7621.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch b/target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch index 408de3a..a66fa34 100644 --- a/target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch +++ b/target/linux/mediatek/patches-4.14/0102-soc-mediatek-pwrap-fixup-warnings-from-coding-style.patch @@ -13,11 +13,9 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com> drivers/soc/mediatek/mtk-pmic-wrap.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) -diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c -index c2048382830f..f095faac1e04 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c -@@ -827,7 +827,8 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp) +@@ -827,7 +827,8 @@ static int pwrap_init_cipher(struct pmic /* wait for cipher data ready@PMIC */ ret = pwrap_wait_for_state(wrp, pwrap_is_pmic_cipher_ready); if (ret) { @@ -27,7 +25,7 @@ index c2048382830f..f095faac1e04 100644 return ret; } -@@ -1159,23 +1160,27 @@ static int pwrap_probe(struct platform_device *pdev) +@@ -1159,23 +1160,27 @@ static int pwrap_probe(struct platform_d if (IS_ERR(wrp->bridge_base)) return PTR_ERR(wrp->bridge_base); @@ -59,7 +57,7 @@ index c2048382830f..f095faac1e04 100644 return PTR_ERR(wrp->clk_wrap); } -@@ -1220,8 +1225,9 @@ static int pwrap_probe(struct platform_device *pdev) +@@ -1220,8 +1225,9 @@ static int pwrap_probe(struct platform_d pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN); irq = platform_get_irq(pdev, 0); @@ -71,6 +69,3 @@ index c2048382830f..f095faac1e04 100644 if (ret) goto err_out2; --- -2.11.0 - |