From: Simon Glass <sjg@chromium.org>
Date: Sat, 7 Dec 2019 04:42:44 +0000 (-0700)
Subject: spi: ich: Correct max-size bug in ich_spi_adjust_size()
X-Git-Tag: v2020.04-rc1~39^2~2^2~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=43c145b8b3eeb77a31d3dd4810929b14c29003de;p=oweals%2Fu-boot.git

spi: ich: Correct max-size bug in ich_spi_adjust_size()

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

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

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);