diff --git a/components/esp_adc_cal/esp_adc_cal_common.c b/components/esp_adc_cal/esp_adc_cal_common.c
index 6fb7040afe..09878cc015 100644
--- a/components/esp_adc_cal/esp_adc_cal_common.c
+++ b/components/esp_adc_cal/esp_adc_cal_common.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -34,7 +34,10 @@ esp_err_t esp_adc_cal_get_voltage(adc_channel_t channel,
         ESP_RETURN_ON_FALSE(channel < SOC_ADC_CHANNEL_NUM(1), ESP_ERR_INVALID_ARG, TAG, "Invalid channel");
         ret = adc2_get_raw(channel, chars->bit_width, &adc_reading);
     }
-    *voltage = esp_adc_cal_raw_to_voltage((uint32_t)adc_reading, chars);
+
+    if (ret == ESP_OK) {
+        *voltage = esp_adc_cal_raw_to_voltage((uint32_t)adc_reading, chars);
+    }
     return ret;
 }
 
diff --git a/components/hal/CMakeLists.txt b/components/hal/CMakeLists.txt
index c8c1a87495..4d92e4d841 100644
--- a/components/hal/CMakeLists.txt
+++ b/components/hal/CMakeLists.txt
@@ -63,7 +63,6 @@ if(NOT BOOTLOADER_BUILD)
                     "usb_hal.c"
                     "usb_phy_hal.c"
                     "xt_wdt_hal.c"
-                    "esp32s2/adc_hal.c"
                     "esp32s2/brownout_hal.c"
                     "esp32s2/cp_dma_hal.c"
                     "esp32s2/touch_sensor_hal.c"
diff --git a/components/hal/esp32s2/adc_hal.c b/components/hal/esp32s2/adc_hal.c
deleted file mode 100644
index e69de29bb2..0000000000