Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050c0c1b authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: redboot: remove useless code 



We do not need to invoke 'mtd_can_have_bb()' before invoking
'mtd_block_isbad()' because the latter already handles the case when the MTD
device does not support bad blocks.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b2567572

drivers/mtd/redboot.c

+2 −4
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ static int parse_redboot_partitions(struct mtd_info *master, 


	if ( directory < 0 ) {

		offset = master->size + directory * master->erasesize;

		while (mtd_can_have_bb(master) &&

		       mtd_block_isbad(master, offset)) {

		while (mtd_block_isbad(master, offset)) {

			if (!offset) {

			nogood:

				printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
@@ -89,8 +88,7 @@ static int parse_redboot_partitions(struct mtd_info *master, 
		}

	} else {

		offset = directory * master->erasesize;

		while (mtd_can_have_bb(master) &&

		       mtd_block_isbad(master, offset)) {

		while (mtd_block_isbad(master, offset)) {

			offset += master->erasesize;

			if (offset == master->size)

				goto nogood;