diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch) | |
| tree | e4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch | |
| parent | bbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff) | |
| download | master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2 master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip | |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/110-mtd-move-nand_ecc_ctrl-init.patch | 8 |
1 files changed, 3 insertions, 5 deletions
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 4f22ce1395..f1af8233e3 100644 --- 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) |