From: Tomas Vanek <vanekt@fbl.cz>
Date: Sun, 17 May 2020 06:17:25 +0000 (+0200)
Subject: flash/nor/jtagspi: propagate error from jtag_execute_queue()
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9a5af06f821e2c61adbf2b5cac720ba8d608a014;p=fw%2Fopenocd

flash/nor/jtagspi: propagate error from jtag_execute_queue()

Change-Id: Ib985bdf3d60345a1e701f9cc98f89a47ff74d3e2
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5684
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
---

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 73b1c7a26..d841579ff 100644
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -153,12 +153,12 @@ static int jtagspi_cmd(struct flash_bank *bank, uint8_t cmd,
 	jtagspi_set_ir(bank);
 	/* passing from an IR scan to SHIFT-DR clears BYPASS registers */
 	jtag_add_dr_scan(info->tap, n, fields, TAP_IDLE);
-	jtag_execute_queue();
+	int retval = jtag_execute_queue();
 
 	if (is_read)
 		flip_u8(data_buf, data, lenb);
 	free(data_buf);
-	return ERROR_OK;
+	return retval;
 }
 
 static int jtagspi_probe(struct flash_bank *bank)