[Pkg-electronics-commits] [openocd] 02/19: ftdi: incorrectly using output register for direction

[Jonathan McDowell]

This is an automated email from the git hooks/post-receive script.

noodles pushed a commit to annotated tag v0.6.1
in repository openocd.

commit 6cb0c3ff140f3f171f6ee3c544a43f5d9d8c33f0
Author: Spencer Oliver <spen at spen-soft.co.uk>
Date:   Wed Sep 26 15:31:53 2012 +0100

    ftdi: incorrectly using output register for direction
    
    fix a simple copy/paste bug.
    
    Change-Id: I5caaa4d16d30f26a453bd6a00c95261fd6e716c5
    Signed-off-by: Spencer Oliver <spen at spen-soft.co.uk>
    Reviewed-on: http://openocd.zylin.com/873
    Tested-by: jenkins
---
 src/jtag/drivers/ftdi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 46797d7..b5bea83 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -175,7 +175,7 @@ static int ftdi_set_signal(const struct signal *s, char value)
 
 	output = data ? output | s->data_mask : output & ~s->data_mask;
 	if (s->oe_mask == s->data_mask)
-		direction = oe ? output | s->oe_mask : output & ~s->oe_mask;
+		direction = oe ? direction | s->oe_mask : direction & ~s->oe_mask;
 	else
 		output = oe ? output | s->oe_mask : output & ~s->oe_mask;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/openocd.git