espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/spi_free_crash_uninitialized_v4.3' into 'release/v4.3'

Browse Source 
spi: fixed crash when calling spi_bus_free when not initialized (v4.3)

See merge request espressif/esp-idf!17609
This commit is contained in:
Michael (XIAO Xufeng)
2022-03-28 18:22:51 +08:00
parent eeea576409 eca8b7ca41
commit 06ce378142
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -734,6 +734,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;