46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 1389e9a38b24a3e0dcf0b5dd62c99a57756619fb Mon Sep 17 00:00:00 2001
|
|
From: Tudor Ambarus <tudor.ambarus@microchip.com>
|
|
Date: Fri, 4 Oct 2019 10:47:55 +0000
|
|
Subject: [PATCH 05/39] mtd: spi-nor: Fix direction of the write_sr() transfer
|
|
|
|
mainline inclusion
|
|
from mainline-v5.4-rc3
|
|
commit 41e086e1550646344dd47d3462ca2d19caabb943
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8CSBP
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=41e086e1550646344dd47d3462ca2d19caabb943
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
write_sr() sends data to the SPI memory, fix the direction.
|
|
|
|
Fixes: b35b9a10362d ("mtd: spi-nor: Move m25p80 code in spi-nor.c")
|
|
Reported-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
|
|
Tested-by: John Garry <john.garry@huawei.com>
|
|
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
|
|
index 0161662768e7..33dace0b4c8b 100644
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -345,7 +345,7 @@ static inline int write_sr(struct spi_nor *nor, u8 val)
|
|
SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1),
|
|
SPI_MEM_OP_NO_ADDR,
|
|
SPI_MEM_OP_NO_DUMMY,
|
|
- SPI_MEM_OP_DATA_IN(1, nor->bouncebuf, 1));
|
|
+ SPI_MEM_OP_DATA_OUT(1, nor->bouncebuf, 1));
|
|
|
|
return spi_mem_exec_op(nor->spimem, &op);
|
|
}
|
|
--
|
|
2.27.0
|
|
|