summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpencer Oliver <ntfreak@users.sourceforge.net>2010-12-08 19:54:10 +0000
committerSpencer Oliver <ntfreak@users.sourceforge.net>2010-12-08 19:54:10 +0000
commitfa4680548150b51083239e3a5181a2ecd86a0da9 (patch)
treed24bc8daa4a70d9763f5a08686e898f14d7e2561 /src
parent740b9e25b410c164e661d0334a9ea4168406726b (diff)
downloadopenocd+libswd-fa4680548150b51083239e3a5181a2ecd86a0da9.tar.gz
openocd+libswd-fa4680548150b51083239e3a5181a2ecd86a0da9.tar.bz2
openocd+libswd-fa4680548150b51083239e3a5181a2ecd86a0da9.tar.xz
openocd+libswd-fa4680548150b51083239e3a5181a2ecd86a0da9.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/jtag/drivers/ft2232.c2
-rw-r--r--src/jtag/drivers/parport.c2
2 files changed, 2 insertions, 2 deletions
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;
}