build: fix build from previous commit
authorSpencer Oliver <ntfreak@users.sourceforge.net>
Wed, 8 Dec 2010 19:54:10 +0000 (19:54 +0000)
committerSpencer Oliver <ntfreak@users.sourceforge.net>
Wed, 8 Dec 2010 19:54:10 +0000 (19:54 +0000)
commit 740b9e25b410c164e661d0334a9ea4168406726b broke the drivers
for ftdi and parport due to retval already being defined.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
src/jtag/drivers/ft2232.c
src/jtag/drivers/parport.c

index 77b5880..c8a98d2 100644 (file)
@@ -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);
index 3402bc2..b61f2f1 100644 (file)
@@ -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;
        }