kernel: update 4.1 to 4.1.5

[openwrt.git] / target / linux / sunxi / patches-4.1 / 110-mtd-move-nand_ecc_ctrl-init.patch

diff --git a/target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch b/target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch
index 4f22ce1..f1af823 100644 (file)
--- a/target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch
+++ b/target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch
@@ -15,11 +15,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  drivers/mtd/nand/nand_base.c | 91 +++++++++++++++++++++++++++-----------------
  1 file changed, 56 insertions(+), 35 deletions(-)
 
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index c2e1232..f580ed1 100644
 --- a/drivers/mtd/nand/nand_base.c
 +++ b/drivers/mtd/nand/nand_base.c
-@@ -3892,42 +3892,15 @@ static bool nand_ecc_strength_good(struct mtd_info *mtd)
+@@ -3892,42 +3892,15 @@ static bool nand_ecc_strength_good(struc
        return corr >= ds_corr && ecc->strength >= chip->ecc_strength_ds;
  }
  
@@ -42,7 +40,7 @@ index c2e1232..f580ed1 100644
 -      struct nand_chip *chip = mtd->priv;
 -      struct nand_ecc_ctrl *ecc = &chip->ecc;
 -      struct nand_buffers *nbuf;
--
+ 
 -      /* New bad blocks should be marked in OOB, flash-based BBT, or both */
 -      BUG_ON((chip->bbt_options & NAND_BBT_NO_OOB_BBM) &&
 -                      !(chip->bbt_options & NAND_BBT_USE_FLASH));
@@ -55,7 +53,7 @@ index c2e1232..f580ed1 100644
 -              nbuf->ecccalc = (uint8_t *)(nbuf + 1);
 -              nbuf->ecccode = nbuf->ecccalc + mtd->oobsize;
 -              nbuf->databuf = nbuf->ecccode + mtd->oobsize;
- 
+-
 -              chip->buffers = nbuf;
 -      } else {
 -              if (!chip->buffers)