diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index 422b8651d48..00f8eba39a6 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -409,6 +409,7 @@ int i2c_register(FAR struct i2c_master_s *i2c, int bus)
            */
 
           kmm_free(priv);
+          return ret;
         }
 
       /* Return the result of the registration */
diff --git a/drivers/i2s/i2schar.c b/drivers/i2s/i2schar.c
index 21f37ac0552..9b23abc5351 100644
--- a/drivers/i2s/i2schar.c
+++ b/drivers/i2s/i2schar.c
@@ -439,6 +439,7 @@ int i2schar_register(FAR struct i2s_dev_s *i2s, int minor)
            */
 
           kmm_free(priv);
+          return ret;
         }
 
       /* Return the result of the registration */
diff --git a/drivers/spi/spi_driver.c b/drivers/spi/spi_driver.c
index 5f930b62dfa..2d43c8eec0f 100644
--- a/drivers/spi/spi_driver.c
+++ b/drivers/spi/spi_driver.c
@@ -398,6 +398,7 @@ int spi_register(FAR struct spi_dev_s *spi, int bus)
            */
 
           kmm_free(priv);
+          return ret;
         }
 
       /* Return the result of the registration */
diff --git a/include/nuttx/analog/adc.h b/include/nuttx/analog/adc.h
index 8826c760fb8..c1eea3ea42c 100644
--- a/include/nuttx/analog/adc.h
+++ b/include/nuttx/analog/adc.h
@@ -128,7 +128,7 @@ struct adc_fifo_s
 
 /* This structure defines all of the operations providd by the architecture specific
  * logic.  All fields must be provided with non-NULL function pointers by the
- * caller of can_register().
+ * caller of adc_register().
  */
 
 struct adc_dev_s;