diff --git a/audio/audio.c b/audio/audio.c
index 6149eb592bc..1dde458efd5 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -233,9 +233,9 @@ static int audio_close(FAR struct file *filep)
 
       lower->ops->shutdown(lower);
     }
+
   ret = OK;
 
-//errout_with_sem:
   nxsem_post(&upper->exclsem);
 
 errout:
diff --git a/configs/stm32f103-minimum/src/Makefile b/configs/stm32f103-minimum/src/Makefile
index d2a4afcfbe2..90105c86682 100644
--- a/configs/stm32f103-minimum/src/Makefile
+++ b/configs/stm32f103-minimum/src/Makefile
@@ -69,6 +69,10 @@ ifeq ($(CONFIG_LEDS_APA102),y)
   CSRCS += stm32_apa102.c
 endif
 
+ifeq ($(CONFIG_SENSORS_BMP180),y)
+  CSRCS += stm32_bmp180.c
+endif
+
 ifeq ($(CONFIG_LM75_I2C),y)
   CSRCS += stm32_lm75.c
 endif
diff --git a/configs/stm32f103-minimum/src/stm32_bmp180.c b/configs/stm32f103-minimum/src/stm32_bmp180.c
new file mode 100644
index 00000000000..fc5e9964e72
--- /dev/null
+++ b/configs/stm32f103-minimum/src/stm32_bmp180.c
@@ -0,0 +1,105 @@
+/************************************************************************************
+ * configs/stm32f103-minimum/src/stm32_bmp180.c
+ *
+ *   Copyright (C) 2018 Alan Carvalho de Assis. All rights reserved.
+ *   Author: Alan Carvalho de Assis <acassis@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/spi/spi.h>
+#include <nuttx/sensors/bmp180.h>
+
+#include "stm32.h"
+#include "stm32_i2c.h"
+#include "stm32f103_minimum.h"
+
+#if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_BMP180)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#define MPL115A_I2C_PORTNO 1   /* On I2C1 */
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_bmp180initialize
+ *
+ * Description:
+ *   Initialize and register the MPL115A Pressure Sensor driver.
+ *
+ * Input parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/press0"
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ************************************************************************************/
+
+int stm32_bmp180initialize(FAR const char *devpath)
+{
+  FAR struct i2c_master_s *i2c;
+  int ret;
+
+  sninfo("Initializing BMP180!\n");
+
+  /* Initialize I2C */
+
+  i2c = stm32_i2cbus_initialize(BMP180_I2C_PORTNO);
+
+  if (!i2c)
+    {
+      return -ENODEV;
+    }
+
+  /* Then register the barometer sensor */
+
+  ret = bmp180_register(devpath, i2c);
+  if (ret < 0)
+    {
+      snerr("ERROR: Error registering BM180\n");
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_I2C && CONFIG_SENSORS_MPL115A && CONFIG_STM32_I2C1 */
diff --git a/configs/stm32f103-minimum/src/stm32_bringup.c b/configs/stm32f103-minimum/src/stm32_bringup.c
index dec8bea5e1a..e0f3f55972e 100644
--- a/configs/stm32f103-minimum/src/stm32_bringup.c
+++ b/configs/stm32f103-minimum/src/stm32_bringup.c
@@ -176,6 +176,15 @@ int stm32_bringup(void)
     }
 #endif
 
+#ifdef CONFIG_SENSORS_BMP180
+  ret = stm32_bmp180initialize("/dev/press0");
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "Failed to initialize BMP180, error %d\n", ret);
+      return ret;
+    }
+#endif
+
 #ifdef HAVE_W25
   /* Initialize and register the W25 FLASH file system. */
 
diff --git a/configs/stm32f103-minimum/src/stm32f103_minimum.h b/configs/stm32f103-minimum/src/stm32f103_minimum.h
index 8ccae09f3d0..69427573d28 100644
--- a/configs/stm32f103-minimum/src/stm32f103_minimum.h
+++ b/configs/stm32f103-minimum/src/stm32f103_minimum.h
@@ -252,6 +252,19 @@ int stm32_adc_setup(void);
 int stm32_apds9960initialize(FAR const char *devpath);
 #endif
 
+/****************************************************************************
+ * Name: stm32_bmp180initialize
+ *
+ * Description:
+ *   Called to configure an I2C and to register BMP180 for the stm32f4discovery
+ *   board.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SENSORS_BMP180
+int stm32_bmp180initialize(FAR const char *devpath);
+#endif
+
 /************************************************************************************
  * Name: stm32_spidev_initialize
  *
diff --git a/crypto/aes.c b/crypto/aes.c
index 3927a283608..4aa5cd1c137 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -543,7 +543,7 @@ static void aes_decr(FAR uint8_t *state, FAR const uint8_t *expanded_key)
  * Public Functions
  ****************************************************************************/
 
- /****************************************************************************
+/****************************************************************************
  * Name: aes_encrypt
  *
  * Description: