From b93a6f3074c040af5041acdb5a176aecfe2ac38f Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 27 May 2023 09:18:44 +0000
Subject: [PATCH] Fixed bug #1265.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16267 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 .../serial_nor/devices/macronix_mx25/hal_flash_device.c        | 3 ---
 .../complex/serial_nor/devices/micron_n25q/hal_flash_device.c  | 3 ---
 readme.txt                                                     | 2 ++
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c b/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
index a7307a6bf..d97bce293 100644
--- a/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
+++ b/os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
@@ -591,9 +591,6 @@ flash_error_t snor_device_verify_erase(SNORDriver *devp,
     /* Checking for erased state of current buffer.*/
     for (p = devp->nocache->buf; p < &devp->nocache->buf[SNOR_BUFFER_SIZE]; p++) {
       if (*p != 0xFFU) {
-        /* Ready state again.*/
-        devp->state = FLASH_READY;
-
         return FLASH_ERROR_VERIFY;
       }
     }
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
index bba73f9a0..a4cba1ab2 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
@@ -473,9 +473,6 @@ flash_error_t snor_device_verify_erase(SNORDriver *devp,
     /* Checking for erased state of current buffer.*/
     for (p = cmpbuf; p < &cmpbuf[N25Q_COMPARE_BUFFER_SIZE]; p++) {
       if (*p != 0xFFU) {
-        /* Ready state again.*/
-        devp->state = FLASH_READY;
-
         return FLASH_ERROR_VERIFY;
       }
     }
diff --git a/readme.txt b/readme.txt
index 955e6e000..35e998812 100644
--- a/readme.txt
+++ b/readme.txt
@@ -114,6 +114,8 @@
        instead of a simple size.
 - NEW: RT and NIL upgraded to support the enhanced OSLIB.
 - NEW: Memory areas/pointers checker functions added to OSLIB.
+- FIX: Fixed unnecessary code in SNOR device drivers (bug #1265)
+       (backported to 20.3.5)(backported to 21.11.4).
 - FIX: Fixed channel 0 corruption on STM32 BDMAv1 (bug #1263)
        (backported to 20.3.5)(backported to 21.11.4).
 - FIX: Fixed wrong statistics in RT7 (bug #1262)(backported to 21.11.4).