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

Commit 0bad7b93 authored by Michal Suchanek's avatar Michal Suchanek Committed by Brian Norris
Browse files

mtd: spi-nor: check return value from write 



SPI NOR hardware drivers now return useful value from their write
functions so check them.

Signed-off-by: default avatarMichal Suchanek <hramrach@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: default avatarMichal Suchanek <hramrach@gmail.com>
Tested-by: default avatarMichal Suchanek <hramrach@gmail.com>
parent bc418cd2

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

+32 −13
Original line number Diff line number Diff line
@@ -1063,10 +1063,14 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		nor->program_opcode = SPINOR_OP_BP;



		/* write one byte. */

		nor->write(nor, to, 1, retlen, buf);

		ret = nor->write(nor, to, 1, retlen, buf);

		if (ret < 0)

			goto sst_write_err;

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",

		     (int)ret);

		ret = spi_nor_wait_till_ready(nor);

		if (ret)

			goto time_out;

			goto sst_write_err;

	}

	to += actual;
@@ -1075,10 +1079,14 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
		nor->program_opcode = SPINOR_OP_AAI_WP;



		/* write two bytes. */

		nor->write(nor, to, 2, retlen, buf + actual);

		ret = nor->write(nor, to, 2, retlen, buf + actual);

		if (ret < 0)

			goto sst_write_err;

		WARN(ret != 2, "While writing 2 bytes written %i bytes\n",

		     (int)ret);

		ret = spi_nor_wait_till_ready(nor);

		if (ret)

			goto time_out;

			goto sst_write_err;

		to += 2;

		nor->sst_write_second = true;

	}
@@ -1087,21 +1095,24 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, 
	write_disable(nor);

	ret = spi_nor_wait_till_ready(nor);

	if (ret)

		goto time_out;

		goto sst_write_err;



	/* Write out trailing byte if it exists. */

	if (actual != len) {

		write_enable(nor);



		nor->program_opcode = SPINOR_OP_BP;

		nor->write(nor, to, 1, retlen, buf + actual);



		ret = nor->write(nor, to, 1, retlen, buf + actual);

		if (ret < 0)

			goto sst_write_err;

		WARN(ret != 1, "While writing 1 byte written %i bytes\n",

		     (int)ret);

		ret = spi_nor_wait_till_ready(nor);

		if (ret)

			goto time_out;

			goto sst_write_err;

		write_disable(nor);

	}

time_out:

sst_write_err:

	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);

	return ret;

}
@@ -1130,14 +1141,18 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, 


	/* do all the bytes fit onto one page? */

	if (page_offset + len <= nor->page_size) {

		nor->write(nor, to, len, retlen, buf);

		ret = nor->write(nor, to, len, retlen, buf);

		if (ret < 0)

			goto write_err;

	} else {

		/* the size of data remaining on the first page */

		page_size = nor->page_size - page_offset;

		nor->write(nor, to, page_size, retlen, buf);

		ret = nor->write(nor, to, page_size, retlen, buf);

		if (ret < 0)

			goto write_err;



		/* write everything in nor->page_size chunks */

		for (i = page_size; i < len; i += page_size) {

		for (i = ret; i < len; ) {

			page_size = len - i;

			if (page_size > nor->page_size)

				page_size = nor->page_size;
@@ -1148,7 +1163,11 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, 


			write_enable(nor);



			nor->write(nor, to + i, page_size, retlen, buf + i);

			ret = nor->write(nor, to + i, page_size, retlen,

					 buf + i);

			if (ret < 0)

				goto write_err;

			i += ret;

		}

	}