diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-03 21:06:41 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-03 21:06:41 +0300 |
| commit | a0953b34d9d8d9309c3eabbb75746fef66b15ffe (patch) | |
| tree | fee03fcbb1c88c5b4a4a50c9aa9db497f7e046bd /drivers/spi | |
| parent | b91c70433386d133c842729c5d9b109cdcc79399 (diff) | |
| parent | d008190920fbea4cd52b185e5191e6e0e5ae1f56 (diff) | |
| download | u-boot-a0953b34d9d8d9309c3eabbb75746fef66b15ffe.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-spi
- SPI-NOR fix (Big Meng)
- XMC XM25QH64C flash (Reto Schneider)
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-mem-nodm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c index a228c808c7..77ddb19a9f 100644 --- a/drivers/spi/spi-mem-nodm.c +++ b/drivers/spi/spi-mem-nodm.c @@ -93,12 +93,14 @@ int spi_mem_adjust_op_size(struct spi_slave *slave, if (slave->max_write_size && len > slave->max_write_size) return -EINVAL; - if (op->data.dir == SPI_MEM_DATA_IN && slave->max_read_size) - op->data.nbytes = min(op->data.nbytes, - slave->max_read_size); - else if (slave->max_write_size) + if (op->data.dir == SPI_MEM_DATA_IN) { + if (slave->max_read_size) + op->data.nbytes = min(op->data.nbytes, + slave->max_read_size); + } else if (slave->max_write_size) { op->data.nbytes = min(op->data.nbytes, slave->max_write_size - len); + } if (!op->data.nbytes) return -EINVAL; |