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

Commit d6af2694 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Brian Norris
Browse files

mtd: spi-nor: fix error handling in spi_nor_erase 



The documenting comment of mtd_erase in mtdcore.c states:
Device drivers are supposed to call instr->callback() whenever
the operation completes, even if it completes with a failure.

Currently the callback isn't called in case of failure. Fix this.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 0f6d3f40

drivers/mtd/spi-nor/spi-nor.c

+2 −6
Original line number Diff line number Diff line
@@ -410,17 +410,13 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) 


	write_disable(nor);



erase_err:

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);



	instr->state = MTD_ERASE_DONE;

	instr->state = ret ? MTD_ERASE_FAILED : MTD_ERASE_DONE;

	mtd_erase_callback(instr);



	return ret;



erase_err:

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);

	instr->state = MTD_ERASE_FAILED;

	return ret;

}



static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs,