Merge branch 'fix/i2c_null_check' into 'master'

fix(i2c): add NULL check and correct log

See merge request espressif/esp-idf!46662
This commit is contained in:
morris
2026-03-17 11:15:03 +08:00
+2 -1
View File
@@ -887,7 +887,7 @@ static esp_err_t i2c_param_master_config(i2c_bus_handle_t handle, const i2c_mast
static esp_err_t i2c_master_bus_destroy(i2c_master_bus_handle_t bus_handle)
{
ESP_RETURN_ON_FALSE(bus_handle, ESP_ERR_INVALID_ARG, TAG, "no memory for i2c master bus");
ESP_RETURN_ON_FALSE(bus_handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
i2c_master_bus_handle_t i2c_master = bus_handle;
esp_err_t err = ESP_OK;
if (i2c_master->base) {
@@ -1228,6 +1228,7 @@ esp_err_t i2c_master_bus_rm_device(i2c_master_dev_handle_t handle)
esp_err_t i2c_del_master_bus(i2c_master_bus_handle_t bus_handle)
{
ESP_RETURN_ON_FALSE(bus_handle, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
ESP_LOGD(TAG, "del i2c bus(%d)", bus_handle->base->port_num);
// Check if the device list is empty