feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/wdt_deinit_timeout_v4.4' into 'release/v4.4'

Browse Source 
fix(wdt): fixed potential WDT timeout when deinitializing task watchdog (v4.4)

See merge request espressif/esp-idf!25984
This commit is contained in:
Marius Vikhammer
2023-10-19 13:39:52 +08:00
parent 0b31c7ab79 e557ed94fb
commit 9f48c5eaf5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_system/task_wdt.c
View File

@@ -252,10 +252,14 @@ esp_err_t esp_task_wdt_deinit(void)
//Disable hardware timer
wdt_hal_deinit(&twdt_context);
ESP_ERROR_CHECK(esp_intr_free(twdt_config->intr_handle)); //Unregister interrupt
free(twdt_config); //Free twdt_config
/* Need to exit critical section to free interrupt (potential IPC call), store and clear config before exiting */
twdt_config_t *twdt_config_temp = twdt_config;
twdt_config = NULL;
portEXIT_CRITICAL(&twdt_spinlock);
ESP_ERROR_CHECK(esp_intr_free(twdt_config_temp->intr_handle)); //Unregister interrupt
free(twdt_config_temp); //Free twdt_config
return ESP_OK;
}