1 files changed, 3 insertions, 0 deletions
diff --git a/flashrom.c b/flashrom.c
index 12d73901..8849f639 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -2215,6 +2215,9 @@ int prepare_flash_access(struct flashctx *const flash,
 	if (flash->chip->unlock)
 		flash->chip->unlock(flash);
 
+	flash->address_high_byte = -1;
+	flash->in_4ba_mode = false;
+
 	/* Enable/disable 4-byte addressing mode if flash chip supports it */
 	if ((flash->chip->feature_bits & FEATURE_4BA_SUPPORT) &&
 	    flash->chip->four_bytes_addr_funcs.set_4ba) {