diff --git a/arch b/arch
index a91eb08c8ab..fb422572968 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit a91eb08c8abc2cbcd3b72732dbc2ac0dfa2f2f61
+Subproject commit fb42257296843a19a50cbca004324f1c88a00b8f
diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c
index c2a8f05ba2e..4b061a3ba8f 100644
--- a/drivers/mtd/s25fl1.c
+++ b/drivers/mtd/s25fl1.c
@@ -966,6 +966,8 @@ static int s25fl1_write_page(struct s25fl1_dev_s *priv, FAR const uint8_t *buffe
 
       s25fl1_write_enable(priv);
       ret = QSPI_MEMORY(priv->qspi, &meminfo);
+      s25fl1_write_disable(priv);
+
       if (ret < 0)
         {
           fdbg("ERROR: QSPI_MEMORY failed writing address=%06x\n",
@@ -985,7 +987,6 @@ static int s25fl1_write_page(struct s25fl1_dev_s *priv, FAR const uint8_t *buffe
    */
 
   DEBUGASSERT(buflen == 0);
-  s25fl1_write_disable(priv);
   return OK;
 }