Skip to content

[Backport v3.7-branch] mgmt: mcumgr: grp: img_mgmt: Fix calling confirm #85048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
Merged

[Backport v3.7-branch] mgmt: mcumgr: grp: img_mgmt: Fix calling confirm #85048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:
Expand Down
Loading