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 77b5880b1f774ccb148e0113953d80595cc6187d..c8a98d2d296d038c1f4555d5ec4727bef0183fd8 100644 (file)
--- 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 3402bc2a05b78350b8127fd598f097f8f4d15d15..b61f2f15e46c0695b33ec65234b2c2c992b21f2d 100644 (file)
--- 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;
        }