From 0221ba5aef37172949fedf25a61ba76b47795d7b Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Sat, 13 Jul 2019 10:06:35 -0400 Subject: [PATCH] fix nand-disable-badblock-check-for-migration patch --- ...and-disable-badblock-check-for-migration.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/patch/kernel/sunxi-dev/nand-disable-badblock-check-for-migration.patch b/patch/kernel/sunxi-dev/nand-disable-badblock-check-for-migration.patch index 14de9b6b4d..0a368cfa99 100644 --- a/patch/kernel/sunxi-dev/nand-disable-badblock-check-for-migration.patch +++ b/patch/kernel/sunxi-dev/nand-disable-badblock-check-for-migration.patch @@ -14,18 +14,21 @@ index 71050a0..5f36704 100644 } /** -@@ -4252,16 +4249,7 @@ static int nand_block_isbad(struct mtd_info *mtd, loff_t offs) +@@ -4283,19 +4283,7 @@ static int nand_block_isbad(struct mtd_info *mtd, loff_t offs) int chipnr = (int)(offs >> chip->chip_shift); int ret; - /* Select the NAND device */ -- nand_get_device(mtd, FL_READING); -- chip->select_chip(chip, chipnr); +- ret = nand_get_device(chip); +- if (ret) +- return ret; - -- ret = nand_block_checkbad(mtd, offs, 0); +- nand_select_target(chip, chipnr); - -- chip->select_chip(chip, -1); -- nand_release_device(mtd); +- ret = nand_block_checkbad(chip, offs, 0); +- +- nand_deselect_target(chip); +- nand_release_device(chip); - - return ret; + return 0;