espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback' into 'master'

Browse Source 
esp_timer: fix the bug that when timeout of timer happens try to run callback,...

Closes WIFI-1214

See merge request espressif/esp-idf!6765
This commit is contained in:
Jiang Jiang Jian
2019-11-22 17:37:51 +08:00
parent e4f641f5a9 50fe7e540e
commit 0deeae38a9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_common/src/esp_timer.c
View File

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