From 458af8e4e8bdcc23425392355c068350f9c047be Mon Sep 17 00:00:00 2001
From: Song GUO <songguo@google.com>
Date: Thu, 23 Nov 2023 06:21:29 +0800
Subject: [PATCH] Should reset err if CHIP_ERROR_KEY_NOT_FOUND in ParseICDInfo
 (#30613)

Fixes #30604
Fixes #30414
---
 src/controller/CHIPDeviceController.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 11c966cb84f207..a23dd9cb19cd45 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -2240,6 +2240,7 @@ CHIP_ERROR DeviceCommissioner::ParseICDInfo(ReadCommissioningInfo2 & info)
         // This key is optional so not an error
         err        = CHIP_NO_ERROR;
         info.isIcd = false;
+        err        = CHIP_NO_ERROR;
     }
     else if (err == CHIP_ERROR_IM_STATUS_CODE_RECEIVED)
     {