espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sdmmc_check_slot_before_pullup_4.1' into 'release/v4.1'

Browse Source 
sdmmc: Correctly check function parameters before using them (4.1)

See merge request espressif/esp-idf!9055
This commit is contained in:
Michael (XIAO Xufeng)
2020-08-20 21:59:31 +08:00
parent 829080e10e 29d3c40a25
commit 866dde5025
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver/sdmmc_host.c
View File

@@ -306,10 +306,6 @@ static void configure_pin(int pin)
esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t* slot_config)
{
bool pullup = slot_config->flags & SDMMC_SLOT_FLAG_INTERNAL_PULLUP;
if (pullup) {
sdmmc_host_pullup_en(slot, slot_config->width);
}
if (!s_intr_handle) {
return ESP_ERR_INVALID_STATE;
}
@@ -319,6 +315,10 @@ esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t* slot_config)
if (slot_config == NULL) {
return ESP_ERR_INVALID_ARG;
}
bool pullup = slot_config->flags & SDMMC_SLOT_FLAG_INTERNAL_PULLUP;
if (pullup) {
sdmmc_host_pullup_en(slot, slot_config->width);
}
int gpio_cd = slot_config->gpio_cd;
int gpio_wp = slot_config->gpio_wp;
uint8_t slot_width = slot_config->width;