From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 28 Jul 2021 12:50:14 +0000 (+0800)
Subject: spi: spi-mem-nodm: Fix read data size issue
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=cb42425aa1086f2a732dd2e0614acc0c993c869d;p=u-boot.git

spi: spi-mem-nodm: Fix read data size issue

When slave drivers don't set the max_read_size, the spi-mem should
directly use data.nbytes and not limit to any size. But current
logic will limit to the max_write_size.

This commit mirrors the same changes in the dm version done in
commit 535b1fdb8e5e ("spi: spi-mem: Fix read data size issue").

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
---

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;