alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback_v3.1' into 'release/v3.1'

Browse Source 
esp_timer: fix the bug that when timeout of timer happens try to run callback(v3.1)

See merge request espressif/esp-idf!6766
This commit is contained in:
Jiang Jiang Jian 2019-11-25 10:47:59 +08:00
commit efa1d4d133
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/esp_timer.c
View File

@ -286,8 +286,10 @@ static void timer_process_alarm(esp_timer_dispatch_t dispatch_method)
uint64_t callback_start = now;
s_timer_in_callback = it;
#endif
esp_timer_cb_t callback = it->callback;
void* arg = it->arg;
timer_list_unlock();
(*it->callback)(it->arg);
(*callback)(arg);
timer_list_lock();
now = esp_timer_impl_get_time();
#if WITH_PROFILING