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 'fix/ci_flash_counter_v5.1' into 'release/v5.1'

Browse Source 
fix(spi_flash): Fix spi_flash counter test on CI (backport v5.1)

See merge request espressif/esp-idf!29710
This commit is contained in:
Jiang Jiang Jian
2024-03-19 11:54:42 +08:00
parent 29f78cea74 9afa5e53c0
commit 9f7eacb089
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/spi_flash/esp_flash_api.c
View File

@@ -1202,10 +1202,11 @@ FORCE_INLINE_ATTR esp_err_t s_encryption_write_lock(esp_flash_t *chip) {
} }
FORCE_INLINE_ATTR esp_err_t s_encryption_write_unlock(esp_flash_t *chip) { FORCE_INLINE_ATTR esp_err_t s_encryption_write_unlock(esp_flash_t *chip) {
esp_err_t err = rom_spiflash_api_funcs->end(chip, ESP_OK);
#if CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32S2
esp_crypto_dma_lock_release(); esp_crypto_dma_lock_release();
#endif //CONFIG_IDF_TARGET_ESP32S2 #endif //CONFIG_IDF_TARGET_ESP32S2
return rom_spiflash_api_funcs->end(chip, ESP_OK); return err;
} }