net: lib: nrf_cloud_fota_common: Fix error handling

Add missing return on error in case modem shutdown fails, and remove call to nrf_modem_lib init if image validation fails when the modem is in bootloader mode. The modem needs to be shutdown before it can be initialized in normal mode. Signed-off-by: Simen S. Røstad <[email protected]>
nrfconnect · Sep 13, 2024 · 9cbd24b · 9cbd24b
1 parent a2afb16
commit 9cbd24b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota_common.c b/subsys/net/lib/nrf_cloud/src/nrf_cloud_fota_common.c
@@ -258,13 +258,13 @@ int nrf_cloud_fota_fmfu_apply(void)
 	err = fmfu_fdev_load(fmfu_buf, sizeof(fmfu_buf), fmfu_dev.dev, fmfu_dev.offset);
 	if (err != 0) {
 		LOG_ERR("Failed to apply full modem update, error: %d", err);
-		(void)nrf_modem_lib_init();
 		return err;
 	}
 
 	err = nrf_modem_lib_shutdown();
 	if (err != 0) {
-		LOG_WRN("nrf_modem_lib_shutdown() failed: %d\n", err);
+		LOG_WRN("nrf_modem_lib_shutdown() failed: %d", err);
+		return err;
 	}
 
 	return 0;