espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/place_esp_timer_in_internal_memory_v4.3' into 'release/v4.3'

Browse Source 
ci: Fix for `ETSTimers arm & disarm run from IRAM` UT

See merge request espressif/esp-idf!25423
This commit is contained in:
Jiang Jiang Jian
2023-10-12 18:39:17 +08:00
parent 784a688aa9 e06f2df346
commit 3b34ed72dd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_timer/src/esp_timer.c
View File

@ -110,7 +110,7 @@ esp_err_t esp_timer_create(const esp_timer_create_args_t* args,
if (args == NULL || args->callback == NULL || out_handle == NULL) { if (args == NULL || args->callback == NULL || out_handle == NULL) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
esp_timer_handle_t result = (esp_timer_handle_t) calloc(1, sizeof(*result)); esp_timer_handle_t result = (esp_timer_handle_t) heap_caps_calloc(1, sizeof(*result), MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
if (result == NULL) { if (result == NULL) {
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }