From 2e3942fac9d4670d95d14db5b2e223ea7c6a36d3 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 30 Jan 2025 08:42:03 +0000 Subject: [PATCH] mgmt: mcumgr: grp: img_mgmt: Fix calling confirm Fixes calling the registered callbacks for image being confirmed if the confirmation was not successful Signed-off-by: Jamie McCrae (cherry picked from commit 98d5aa3792a55859529fab737364322324ccd200) --- .../mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c index 79f593236c452..e2981e5038ef5 100644 --- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c +++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c @@ -391,11 +391,6 @@ img_mgmt_state_confirm(void) { int rc; -#if defined(CONFIG_MCUMGR_GRP_IMG_STATUS_HOOKS) - int32_t err_rc; - uint16_t err_group; -#endif - /* Confirm disallowed if a test is pending. */ if (img_mgmt_state_any_pending()) { rc = IMG_MGMT_ERR_IMAGE_ALREADY_PENDING; @@ -405,8 +400,13 @@ img_mgmt_state_confirm(void) rc = img_mgmt_write_confirmed(); #if defined(CONFIG_MCUMGR_GRP_IMG_STATUS_HOOKS) - (void)mgmt_callback_notify(MGMT_EVT_OP_IMG_MGMT_DFU_CONFIRMED, NULL, 0, &err_rc, - &err_group); + if (!rc) { + int32_t err_rc; + uint16_t err_group; + + (void)mgmt_callback_notify(MGMT_EVT_OP_IMG_MGMT_DFU_CONFIRMED, NULL, 0, &err_rc, + &err_group); + } #endif err: