From 21cd7557bd246d6775d09fd0a88b9c28b59eff81 Mon Sep 17 00:00:00 2001
From: Jon Lin <jon.lin@rock-chips.com>
Date: Mon, 22 Apr 2024 09:50:04 +0800
Subject: [PATCH] mtd: spi-nor: Fix the issue of buffer contamination

spi_nor_write_sr will pollute the buffer of sr_cr buffer when calling
spi_nor_read_sr.

Change-Id: I217141297df4f448b64c61f1573e7e40d6874903
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
---
 drivers/mtd/spi-nor/core.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 918c8063a199..f46420308c21 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -940,13 +940,12 @@ int spi_nor_write_16bit_cr_and_check(struct spi_nor *nor, u8 cr)
 		return ret;
 
 	sr_cr[1] = cr;
+	sr_written = sr_cr[0];
 
 	ret = spi_nor_write_sr(nor, sr_cr, 2);
 	if (ret)
 		return ret;
 
-	sr_written = sr_cr[0];
-
 	ret = spi_nor_read_sr(nor, sr_cr);
 	if (ret)
 		return ret;