kernel: bump 4.14 to 4.14.59

[openwrt/staging/lynxis.git] / target / linux / apm821xx / patches-4.14 / 020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch

diff --git a/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch
index 90a6dab2d7a2780510246a74c01a5ce8287e14b3..5ca3faa4dca0eeed6252c5393010a315bbb66578 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch
+++ b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch
@@ -17,7 +17,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
 
 --- a/drivers/crypto/amcc/crypto4xx_core.c
 +++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -394,10 +394,9 @@ static u32 crypto4xx_build_sdr(struct cr
+@@ -396,10 +396,9 @@ static u32 crypto4xx_build_sdr(struct cr
        if (!dev->sdr)
                return -ENOMEM;
  
@@ -29,7 +29,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                        &dev->scatter_buffer_pa, GFP_ATOMIC);
        if (!dev->scatter_buffer_va) {
                dma_free_coherent(dev->core_dev->device,
-@@ -410,7 +409,7 @@ static u32 crypto4xx_build_sdr(struct cr
+@@ -412,7 +411,7 @@ static u32 crypto4xx_build_sdr(struct cr
  
        for (i = 0; i < PPC4XX_NUM_SD; i++) {
                sd_array[i].ptr = dev->scatter_buffer_pa +
@@ -38,9 +38,9 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        }
  
        return 0;
-@@ -425,7 +424,7 @@ static void crypto4xx_destroy_sdr(struct
+@@ -427,7 +426,7 @@ static void crypto4xx_destroy_sdr(struct
  
-       if (dev->scatter_buffer_va != NULL)
+       if (dev->scatter_buffer_va)
                dma_free_coherent(dev->core_dev->device,
 -                                dev->scatter_buffer_size * PPC4XX_NUM_SD,
 +                                PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,