sdmmc: Correctly check function parameters before using them

Closes https://github.com/espressif/esp-idf/pull/5000
This commit is contained in:
Alexander Borsuk 2020-03-26 10:58:35 +01:00 committed by Armando
parent ad2447a6ea
commit cccd679b3e

View File

@ -305,10 +305,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;
}
@ -318,6 +314,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;