Merge branch 'fix_controller_remove_keyset_v1_5' into 'release/v1.5'

components/esp_matter_controller: fix remove group keyset (1.5)

See merge request app-frameworks/esp-matter!1510
This commit is contained in:
Shu Chen
2026-04-22 11:17:59 +00:00
@@ -221,8 +221,8 @@ esp_err_t remove_keyset(uint16_t keyset_id)
} }
iter->Release(); iter->Release();
if (err == CHIP_NO_ERROR) { if (err != CHIP_NO_ERROR) {
return ESP_OK; return ESP_FAIL;
} }
ESP_RETURN_ON_FALSE(CHIP_NO_ERROR == group_data_provider->RemoveKeySet(fabric_index, keyset_id), ESP_FAIL, TAG, ESP_RETURN_ON_FALSE(CHIP_NO_ERROR == group_data_provider->RemoveKeySet(fabric_index, keyset_id), ESP_FAIL, TAG,
"Failed to remove the keyset"); "Failed to remove the keyset");