diff options
author | Tom Rini <trini@konsulko.com> | 2018-01-26 07:46:34 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-01-26 07:46:34 -0500 |
commit | 1d12a7c8cd4e58d5c3989bc239d5fa9577079dfd (patch) | |
tree | 00550f8c91498b648d95c0c1c9f642deb324c4a5 /drivers/mtd/spi/spi_flash.c | |
parent | a3f77c810b1a57853e4d5fee3014ac8cbbd03a9a (diff) | |
parent | 58c125b9e2b232ce73ed7b24ba7b1ca5ff41c5bd (diff) |
Merge git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/mtd/spi/spi_flash.c')
-rw-r--r-- | drivers/mtd/spi/spi_flash.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 51e28bf07b..294d9f9d79 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -405,7 +405,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, if (spi->max_write_size) chunk_len = min(chunk_len, - (size_t)spi->max_write_size); + spi->max_write_size - sizeof(cmd)); spi_flash_addr(write_addr, cmd); @@ -516,6 +516,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, else read_len = remain_len; + if (spi->max_read_size) + read_len = min(read_len, spi->max_read_size); + spi_flash_addr(read_addr, cmd); ret = spi_flash_read_common(flash, cmd, cmdsz, data, read_len); |