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

Commit d4c63813 authored by Holger Brunck's avatar Holger Brunck Committed by Artem Bityutskiy
Browse files

UBI: fix NOR erase preparation quirk 



In 'nor_erase_prepare()' we want to make sure the UBI headers are
corrupted. But it is possible that one of the headers just contains
all 0xFFs, which is also OK, because UBI will erase it in case of
a power cut.

Signed-off-by: default avatarHolger Brunck <holger.brunck@keymile.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 3c0eee3f

drivers/mtd/ubi/io.c

+4 −2
Original line number Diff line number Diff line
@@ -507,11 +507,13 @@ static int nor_erase_prepare(struct ubi_device *ubi, int pnum) 
	 * PEB.

	 */

	err1 = ubi_io_read_vid_hdr(ubi, pnum, &vid_hdr, 0);

	if (err1 == UBI_IO_BAD_HDR_EBADMSG || err1 == UBI_IO_BAD_HDR) {

	if (err1 == UBI_IO_BAD_HDR_EBADMSG || err1 == UBI_IO_BAD_HDR ||

	    err1 == UBI_IO_FF) {

		struct ubi_ec_hdr ec_hdr;



		err1 = ubi_io_read_ec_hdr(ubi, pnum, &ec_hdr, 0);

		if (err1 == UBI_IO_BAD_HDR_EBADMSG || err1 == UBI_IO_BAD_HDR)

		if (err1 == UBI_IO_BAD_HDR_EBADMSG || err1 == UBI_IO_BAD_HDR ||

		    err1 == UBI_IO_FF)

			/*

			 * Both VID and EC headers are corrupted, so we can

			 * safely erase this PEB and not afraid that it will be