diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c
index 1c2fb1d3f45..c3b9e2cef71 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -807,9 +807,9 @@ int stm32_bbsram_savepanic(int fileno, uint8_t *context, int length)
 {
   FAR struct bbsramfh_s *bbf;
   int fill;
-  int ret = -ENOMEM;
+  int ret = -ENOSPC;
 
-  /* on a bad day we could panic while panicking, (and we debug assert)
+  /* On a bad day we could panic while panicking, (and we debug assert)
    * this is a potential feeble attempt at only writing the first
    * panic's context to the file
    */
@@ -826,13 +826,19 @@ int stm32_bbsram_savepanic(int fileno, uint8_t *context, int length)
 
       DEBUGASSERT(bbf);
 
-      /* As once ensures we will keep the first dump checking the time for
+      /* If the g_bbsram has been nulled out we return ENXIO.
+       *
+       * As once ensures we will keep the first dump. Checking the time for
        * 0 protects from over writing a previous crash dump that has not
        * been saved to long term storage and erased.  The dreaded reboot
        * loop.
        */
 
-      if (bbf && (bbf->lastwrite.tv_sec == 0 && bbf->lastwrite.tv_nsec == 0))
+      if (!bbf)
+        {
+          ret = -ENXIO;
+        }
+      else if ((bbf->lastwrite.tv_sec == 0 && bbf->lastwrite.tv_nsec == 0))
         {
           /* Clamp length if too big  */
 
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index fcf168b0df8..c9162eae6f5 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -885,7 +885,7 @@ retry_relocate:
 
       if (dst_offset + sizeof(hdr) >= (dst_block + 1) * dev->erasesize)
         {
-          /* No room at end of dst block for another header.  Go to next block.  */
+          /* No room at end of dst block for another header.  Go to next block. */
 
           dst_block++;
           dst_offset = dst_block * dev->erasesize + CONFIGDATA_BLOCK_HDR_SIZE;
@@ -1271,7 +1271,8 @@ errout:
  * Name: mtdconfig_ioctl
  ****************************************************************************/
 
-static int  mtdconfig_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
+static int mtdconfig_ioctl(FAR struct file *filep, int cmd,
+                           unsigned long arg)
 {
   FAR struct inode *inode = filep->f_inode;
   FAR struct mtdconfig_struct_s *dev = inode->i_private;