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

Merge branch 'bugfix/spi_add_flash' into 'master'

Browse Source 
spi_flash: fix a logic bug in checking ex_flash and psram

Closes IDFGH-2230

See merge request espressif/esp-idf!10009
This commit is contained in:
Michael (XIAO Xufeng)
2020-09-28 10:47:07 +08:00
parent b963dd3b32 4ce8b59016
commit 60fb1a6ef3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/spi_flash_hal.c
View File

@@ -66,7 +66,7 @@ static inline int get_dummy_n(bool gpio_is_used, int input_delay_ns, int eff_clk
esp_err_t spi_flash_hal_init(spi_flash_hal_context_t *data_out, const spi_flash_hal_config_t *cfg) esp_err_t spi_flash_hal_init(spi_flash_hal_context_t *data_out, const spi_flash_hal_config_t *cfg)
{ {
if (!esp_ptr_internal(data_out)) { if (!esp_ptr_internal(data_out) && cfg->host_id == SPI1_HOST) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
if (cfg->cs_num >= SOC_SPI_PERIPH_CS_NUM(cfg->host_id)) { if (cfg->cs_num >= SOC_SPI_PERIPH_CS_NUM(cfg->host_id)) {