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

spi: fixed crash when calling spi_bus_free when not initialized

Browse Source 
introduced in 49a48644e42458366b2dd7b7d153acc943d50e0f

Closes: https://github.com/espressif/esp-idf/issues/8642
This commit is contained in:
Michael (XIAO Xufeng) 2022-03-24 16:28:37 +08:00
parent 16ebc608db
commit bee9b6b9eb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/include/driver/spi_common.h
View File

@ -159,7 +159,7 @@ esp_err_t spi_bus_initialize(spi_host_device_t host_id, const spi_bus_config_t *
* @param host_id SPI peripheral to free * @param host_id SPI peripheral to free
* @return * @return
* - ESP_ERR_INVALID_ARG if parameter is invalid * - ESP_ERR_INVALID_ARG if parameter is invalid
* - ESP_ERR_INVALID_STATE if not all devices on the bus are freed * - ESP_ERR_INVALID_STATE if bus hasn't been initialized before, or not all devices on the bus are freed
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t spi_bus_free(spi_host_device_t host_id); esp_err_t spi_bus_free(spi_host_device_t host_id);

4
components/driver/spi_common.c
View File

@ -862,6 +862,10 @@ const spi_bus_attr_t* spi_bus_get_attr(spi_host_device_t host_id)
esp_err_t spi_bus_free(spi_host_device_t host_id) esp_err_t spi_bus_free(spi_host_device_t host_id)
{ {
if (bus_ctx[host_id] == NULL) {
return ESP_ERR_INVALID_STATE;
}
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
spicommon_bus_context_t* ctx = bus_ctx[host_id]; spicommon_bus_context_t* ctx = bus_ctx[host_id];
spi_bus_attr_t* bus_attr = &ctx->bus_attr; spi_bus_attr_t* bus_attr = &ctx->bus_attr;