This incorrectly shortens read operations if there is a maximum write size
but no maximum read size. Fix it.

Signed-off-by: Simon Glass <s...@chromium.org>
---

Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 drivers/spi/ich.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index 08c37ca4ab..17b7a0ba0b 100644
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -425,9 +425,11 @@ static int ich_spi_adjust_size(struct spi_slave *slave, 
struct spi_mem_op *op)
                page_offset = do_div(aux, ICH_BOUNDARY);
        }
 
-       if (op->data.dir == SPI_MEM_DATA_IN && slave->max_read_size) {
-               op->data.nbytes = min(ICH_BOUNDARY - page_offset,
-                                     slave->max_read_size);
+       if (op->data.dir == SPI_MEM_DATA_IN) {
+               if (slave->max_read_size) {
+                       op->data.nbytes = min(ICH_BOUNDARY - page_offset,
+                                             slave->max_read_size);
+               }
        } else if (slave->max_write_size) {
                op->data.nbytes = min(ICH_BOUNDARY - page_offset,
                                      slave->max_write_size);
-- 
2.24.0.393.g34dc348eaf-goog

Reply via email to