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

Browse Source 
fix(vfs): FATFS mount immediately after format if mount failed (v5.1)

See merge request espressif/esp-idf!32381
This commit is contained in:
Ivan Grokhotkov 2024-08-05 20:32:32 +08:00
commit 9be8ed546e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/fatfs/vfs/vfs_fat_sdmmc.c
View File

@ -135,7 +135,7 @@ static esp_err_t s_f_mount(sdmmc_card_t *card, FATFS *fs, const char *drv, uint8
} }
ESP_LOGW(TAG, "mounting again"); ESP_LOGW(TAG, "mounting again");
res = f_mount(fs, drv, 0); res = f_mount(fs, drv, 1);
if (res != FR_OK) { if (res != FR_OK) {
err = ESP_FAIL; err = ESP_FAIL;
ESP_LOGD(TAG, "f_mount failed after formatting (%d)", res); ESP_LOGD(TAG, "f_mount failed after formatting (%d)", res);

2
components/fatfs/vfs/vfs_fat_spiflash.c
View File

@ -99,7 +99,7 @@ static esp_err_t s_f_mount_rw(FATFS *fs, const char *drv, const esp_vfs_fat_moun
ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mkfs failed (%d)", fresult); ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mkfs failed (%d)", fresult);
ESP_LOGI(TAG, "Mounting again"); ESP_LOGI(TAG, "Mounting again");
fresult = f_mount(fs, drv, 0); fresult = f_mount(fs, drv, 1);
ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mount failed after formatting (%d)", fresult); ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mount failed after formatting (%d)", fresult);
} }
return ESP_OK; return ESP_OK;