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

Merge branch 'fix/fatfs_f_mount_immediately_after_formatting' into 'master'

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

Closes IDF-10538

See merge request espressif/esp-idf!32302
This commit is contained in:
Adam Múdry
2024-07-26 17:39:59 +08:00
parent e37ff3565b a1f493b50f
commit 3ffd716d81
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,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

@@ -104,7 +104,7 @@ static esp_err_t s_f_mount_rw(FATFS *fs, const char *drv, const esp_vfs_fat_moun
} }
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);
} else { } else {
if (out_flags) { if (out_flags) {