diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c
index 38bde4e275..e5272f47ed 100644
--- a/drivers/mtd/n25qxxx.c
+++ b/drivers/mtd/n25qxxx.c
@@ -241,15 +241,15 @@
 
 #define IS_VALID(p)                 ((((p)->flags) & N25QXXX_CACHE_VALID) != 0)
 #define IS_DIRTY(p)                 ((((p)->flags) & N25QXXX_CACHE_DIRTY) != 0)
-#define IS_ERASED(p)                ((((p)->flags) & N25QXXX_CACHE_DIRTY) != 0)
+#define IS_ERASED(p)                ((((p)->flags) & N25QXXX_CACHE_ERASED) != 0)
 
 #define SET_VALID(p)                do { (p)->flags |= N25QXXX_CACHE_VALID; } while (0)
 #define SET_DIRTY(p)                do { (p)->flags |= N25QXXX_CACHE_DIRTY; } while (0)
-#define SET_ERASED(p)               do { (p)->flags |= N25QXXX_CACHE_DIRTY; } while (0)
+#define SET_ERASED(p)               do { (p)->flags |= N25QXXX_CACHE_ERASED; } while (0)
 
 #define CLR_VALID(p)                do { (p)->flags &= ~N25QXXX_CACHE_VALID; } while (0)
 #define CLR_DIRTY(p)                do { (p)->flags &= ~N25QXXX_CACHE_DIRTY; } while (0)
-#define CLR_ERASED(p)               do { (p)->flags &= ~N25QXXX_CACHE_DIRTY; } while (0)
+#define CLR_ERASED(p)               do { (p)->flags &= ~N25QXXX_CACHE_ERASED; } while (0)
 
 /* 512 byte sector support **********************************************************/
 
diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c
index f3181dd475..33a2589638 100644
--- a/drivers/mtd/s25fl1.c
+++ b/drivers/mtd/s25fl1.c
@@ -292,15 +292,15 @@
 
 #define IS_VALID(p)                ((((p)->flags) & S25FL1_CACHE_VALID) != 0)
 #define IS_DIRTY(p)                ((((p)->flags) & S25FL1_CACHE_DIRTY) != 0)
-#define IS_ERASED(p)               ((((p)->flags) & S25FL1_CACHE_DIRTY) != 0)
+#define IS_ERASED(p)               ((((p)->flags) & S25FL1_CACHE_ERASED) != 0)
 
 #define SET_VALID(p)               do { (p)->flags |= S25FL1_CACHE_VALID; } while (0)
 #define SET_DIRTY(p)               do { (p)->flags |= S25FL1_CACHE_DIRTY; } while (0)
-#define SET_ERASED(p)              do { (p)->flags |= S25FL1_CACHE_DIRTY; } while (0)
+#define SET_ERASED(p)              do { (p)->flags |= S25FL1_CACHE_ERASED; } while (0)
 
 #define CLR_VALID(p)               do { (p)->flags &= ~S25FL1_CACHE_VALID; } while (0)
 #define CLR_DIRTY(p)               do { (p)->flags &= ~S25FL1_CACHE_DIRTY; } while (0)
-#define CLR_ERASED(p)              do { (p)->flags &= ~S25FL1_CACHE_DIRTY; } while (0)
+#define CLR_ERASED(p)              do { (p)->flags &= ~S25FL1_CACHE_ERASED; } while (0)
 
 /* 512 byte sector support **********************************************************/
 
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 8da5778d84..9c84c7fba9 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -171,15 +171,15 @@
 
 #define IS_VALID(p)                ((((p)->flags) & SST25_CACHE_VALID) != 0)
 #define IS_DIRTY(p)                ((((p)->flags) & SST25_CACHE_DIRTY) != 0)
-#define IS_ERASED(p)                ((((p)->flags) & SST25_CACHE_DIRTY) != 0)
+#define IS_ERASED(p)                ((((p)->flags) & SST25_CACHE_ERASED) != 0)
 
 #define SET_VALID(p)               do { (p)->flags |= SST25_CACHE_VALID; } while (0)
 #define SET_DIRTY(p)               do { (p)->flags |= SST25_CACHE_DIRTY; } while (0)
-#define SET_ERASED(p)              do { (p)->flags |= SST25_CACHE_DIRTY; } while (0)
+#define SET_ERASED(p)              do { (p)->flags |= SST25_CACHE_ERASED; } while (0)
 
 #define CLR_VALID(p)               do { (p)->flags &= ~SST25_CACHE_VALID; } while (0)
 #define CLR_DIRTY(p)               do { (p)->flags &= ~SST25_CACHE_DIRTY; } while (0)
-#define CLR_ERASED(p)              do { (p)->flags &= ~SST25_CACHE_DIRTY; } while (0)
+#define CLR_ERASED(p)              do { (p)->flags &= ~SST25_CACHE_ERASED; } while (0)
 
 /************************************************************************************
  * Private Types
@@ -1228,7 +1228,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
 
               ferr("ERROR: Allocation failed\n");
               kmm_free(priv);
-              priv = NULL;
+              return NULL;
             }
 #endif
         }
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index da015a8c42..279525e1fc 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -200,15 +200,15 @@
 
 #define IS_VALID(p)                ((((p)->flags) & W25_CACHE_VALID) != 0)
 #define IS_DIRTY(p)                ((((p)->flags) & W25_CACHE_DIRTY) != 0)
-#define IS_ERASED(p)               ((((p)->flags) & W25_CACHE_DIRTY) != 0)
+#define IS_ERASED(p)               ((((p)->flags) & W25_CACHE_ERASED) != 0)
 
 #define SET_VALID(p)               do { (p)->flags |= W25_CACHE_VALID; } while (0)
 #define SET_DIRTY(p)               do { (p)->flags |= W25_CACHE_DIRTY; } while (0)
-#define SET_ERASED(p)              do { (p)->flags |= W25_CACHE_DIRTY; } while (0)
+#define SET_ERASED(p)              do { (p)->flags |= W25_CACHE_ERASED; } while (0)
 
 #define CLR_VALID(p)               do { (p)->flags &= ~W25_CACHE_VALID; } while (0)
 #define CLR_DIRTY(p)               do { (p)->flags &= ~W25_CACHE_DIRTY; } while (0)
-#define CLR_ERASED(p)              do { (p)->flags &= ~W25_CACHE_DIRTY; } while (0)
+#define CLR_ERASED(p)              do { (p)->flags &= ~W25_CACHE_ERASED; } while (0)
 
 /************************************************************************************
  * Private Types
@@ -1278,7 +1278,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
 
               ferr("ERROR: Allocation failed\n");
               kmm_free(priv);
-              priv = NULL;
+              return NULL;
             }
 #endif
         }