From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Mon, 26 Nov 2012 14:27:07 +0000 (+0000)
Subject: jtag: fix reset_config copy/paste error
X-Git-Tag: v0.7.0-rc1~139
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=71d43007c6a3fe32cfcac0712b294029ced4c61b

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>
---

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 5d29bd795f..1abda49ea6 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)