From: Spencer Oliver <ntfreak@users.sourceforge.net>
Date: Wed, 8 Dec 2010 19:54:10 +0000 (+0000)
Subject: build: fix build from previous commit
X-Git-Tag: v0.5.0-rc1~290
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fa4680548150b51083239e3a5181a2ecd86a0da9;p=openocd

build: fix build from previous commit

commit 740b9e25b410c164e661d0334a9ea4168406726b broke the drivers
for ftdi and parport due to retval already being defined.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
---

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 77b5880b..c8a98d2d 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -2396,7 +2396,7 @@ static int ft2232_init(void)
 	}
 
 	int jtag_speed_var;
-	int retval = jtag_get_speed(&jtag_speed_var);
+	retval = jtag_get_speed(&jtag_speed_var);
 	if (retval != ERROR_OK)
 		return retval;
 	ft2232_speed(jtag_speed_var);
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index 3402bc2a..b61f2f15 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -477,7 +477,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 		}
 
 		parport_toggling_time_ns = ns;
-		int retval = jtag_get_speed(&wait_states);
+		retval = jtag_get_speed(&wait_states);
 		if (retval != ERROR_OK)
 			return retval;
 	}