diff --git a/arch/xtensa/src/esp32/esp32_gpio.c b/arch/xtensa/src/esp32/esp32_gpio.c
index e0afb12f45..3ae2b715fa 100644
--- a/arch/xtensa/src/esp32/esp32_gpio.c
+++ b/arch/xtensa/src/esp32/esp32_gpio.c
@@ -241,8 +241,15 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
         (((RTCIO_PIN_FUNC) & RTC_IO_TOUCH_PAD1_FUN_SEL_V) <<
         (rtc_reg_desc.func)));
 
-      resetbits(rtc_reg_desc.reg, rtc_reg_desc.pulldown);
-      resetbits(rtc_reg_desc.reg, rtc_reg_desc.pullup);
+      if (rtc_reg_desc.pulldown)
+        {
+          resetbits(rtc_reg_desc.reg, rtc_reg_desc.pulldown);
+        }
+
+      if (rtc_reg_desc.pullup)
+        {
+          resetbits(rtc_reg_desc.reg, rtc_reg_desc.pullup);
+        }
 
       if ((attr & PULLUP) != 0)
         {
diff --git a/arch/xtensa/src/esp32/esp32_touch.c b/arch/xtensa/src/esp32/esp32_touch.c
index c15ab206ab..bffca15673 100644
--- a/arch/xtensa/src/esp32/esp32_touch.c
+++ b/arch/xtensa/src/esp32/esp32_touch.c
@@ -495,7 +495,7 @@ static void touch_set_voltage(struct touch_config_volt_s *volt)
 }
 
 /****************************************************************************
- * Name: touch_set_voltage
+ * Name: touch_set_meas_mode
  *
  * Description:
  *   Set the measurement mode for a given touch pad.