From 71d43007c6a3fe32cfcac0712b294029ced4c61b Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Mon, 26 Nov 2012 14:27:07 +0000 Subject: [PATCH] jtag: fix reset_config copy/paste error As the other arg checks do not OR, it is assumed this is a copy/paste error from the original code author. Change-Id: I7dfc7396254a6f558887def951c57dfd4a0e6c2c Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/997 Tested-by: jenkins Reviewed-by: Paul Fertser Reviewed-by: Freddie Chopin --- src/jtag/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index 5d29bd795..1abda49ea 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -274,7 +274,7 @@ COMMAND_HANDLER(handle_reset_config_command) goto next; /* srst_type (NOP without HAS_SRST) */ - m |= RESET_SRST_PUSH_PULL; + m = RESET_SRST_PUSH_PULL; if (strcmp(*CMD_ARGV, "srst_push_pull") == 0) tmp |= RESET_SRST_PUSH_PULL; else if (strcmp(*CMD_ARGV, "srst_open_drain") == 0) -- 2.11.4.GIT