[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-210-gd4225192d

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  d4225192df17687f82fa35e5aaec6bed533a8f1f (commit)
      from  3c2cc6efb8c9e892b2a1297ff3147c1d726a8937 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d4225192df17687f82fa35e5aaec6bed533a8f1f
Author: Daniel Anselmi <dan...@gm...>
Date:   Thu Dec 29 20:02:39 2022 +0100

    flash/jtagspi: handle error return values where needed
    
    Change-Id: Id46c2799f954fb1d4353f652ba3115796c88936d
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7422
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index c176ca810..0047d22bb 100644
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -329,7 +329,7 @@ COMMAND_HANDLER(jtagspi_handle_cmd)
 
 	/* process command */
 	ptr = &read_buffer[0];
-	jtagspi_cmd(bank, write_buffer[0], &write_buffer[1], num_write - 1, ptr, -num_read);
+	retval = jtagspi_cmd(bank, write_buffer[0], &write_buffer[1], num_write - 1, ptr, -num_read);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -518,7 +518,7 @@ static int jtagspi_bulk_erase(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	jtagspi_cmd(bank, info->dev.chip_erase_cmd, NULL, 0, NULL, 0);
+	retval = jtagspi_cmd(bank, info->dev.chip_erase_cmd, NULL, 0, NULL, 0);
 	if (retval != ERROR_OK)
 		return retval;
 

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/jtagspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository