aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-11-26 14:27:07 +0000
committerFreddie Chopin <freddie.chopin@gmail.com>2012-12-10 16:18:45 +0000
commit71d43007c6a3fe32cfcac0712b294029ced4c61b (patch)
tree4c34cd02e18f5d5e3000a12ce32b7f65749c4a65
parent2d75ff3151ab659f3cd10a7dd7b0aef54d041e5e (diff)
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 <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/997 Tested-by: jenkins Reviewed-by: Paul Fertser <fercerpav@gmail.com> Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
-rw-r--r--src/jtag/adapter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 5d29bd79..1abda49e 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)