450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch 957 B

123456789101112131415161718192021222324252627282930313233343536
  1. From: Felix Fietkau <[email protected]>
  2. Date: Thu, 22 Feb 2018 11:11:57 +0100
  3. Subject: [PATCH] mtd: spi-nor: allow NOR driver to write fewer bytes than
  4. requested
  5. The write size can be constrained by the maximum message/transfer size
  6. of the SPI controller. Only check for ret = 0 to avoid an infinite loop.
  7. Signed-off-by: Felix Fietkau <[email protected]>
  8. ---
  9. --- a/drivers/mtd/spi-nor/spi-nor.c
  10. +++ b/drivers/mtd/spi-nor/spi-nor.c
  11. @@ -1371,7 +1371,7 @@ static int spi_nor_write(struct mtd_info
  12. write_enable(nor);
  13. ret = nor->write(nor, addr, page_remain, buf + i);
  14. - if (ret < 0)
  15. + if (ret <= 0)
  16. goto write_err;
  17. written = ret;
  18. @@ -1380,13 +1380,6 @@ static int spi_nor_write(struct mtd_info
  19. goto write_err;
  20. *retlen += written;
  21. i += written;
  22. - if (written != page_remain) {
  23. - dev_err(nor->dev,
  24. - "While writing %zu bytes written %zd bytes\n",
  25. - page_remain, written);
  26. - ret = -EIO;
  27. - goto write_err;
  28. - }
  29. }
  30. write_err: