Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback_v4.0' into 'release/v4.0'
esp_timer: fix the bug that when timeout of timer happens try to run callback(v4.0) See merge request espressif/esp-idf!6769
This commit is contained in:
commit
e3f0854771
1 changed files with 3 additions and 1 deletions
|
@ -291,8 +291,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
|
||||||
|
|
Loading…
Reference in a new issue