From 974e29aef678173290b1f5456c0e116e69e3ad4d Mon Sep 17 00:00:00 2001 From: Ahmed BOUDJELIDA Date: Mon, 4 Dec 2023 10:58:05 +0100 Subject: [PATCH] jtag/drivers: correct the angie_reset function remove angie_clear_queue function from executing before the angie_execute_queued_commands function and making it at the end of the reset function. Change-Id: Id8a0664fbd5b8f9730545ce0f8f272ae0b0e7e78 Signed-off-by: Ahmed BOUDJELIDA Reviewed-on: https://review.openocd.org/c/openocd/+/7990 Tested-by: jenkins Reviewed-by: Antonio Borneo --- src/jtag/drivers/angie.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/jtag/drivers/angie.c b/src/jtag/drivers/angie.c index b7d1f8ac3..79195a947 100644 --- a/src/jtag/drivers/angie.c +++ b/src/jtag/drivers/angie.c @@ -1725,14 +1725,16 @@ static int angie_reset(int trst, int srst) high |= SIGNAL_SRST; int ret = angie_append_set_signals_cmd(device, low, high); - if (ret == ERROR_OK) - angie_clear_queue(device); + if (ret != ERROR_OK) + return ret; ret = angie_execute_queued_commands(device, LIBUSB_TIMEOUT_MS); - if (ret == ERROR_OK) - angie_clear_queue(device); + if (ret != ERROR_OK) + return ret; - return ret; + angie_clear_queue(device); + + return ERROR_OK; } /**