build: fix build from previous commit
commit 740b9e25b4
broke the drivers
for ftdi and parport due to retval already being defined.
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
This commit is contained in:
parent
740b9e25b4
commit
fa46805481
|
@ -2396,7 +2396,7 @@ static int ft2232_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
int jtag_speed_var;
|
int jtag_speed_var;
|
||||||
int retval = jtag_get_speed(&jtag_speed_var);
|
retval = jtag_get_speed(&jtag_speed_var);
|
||||||
if (retval != ERROR_OK)
|
if (retval != ERROR_OK)
|
||||||
return retval;
|
return retval;
|
||||||
ft2232_speed(jtag_speed_var);
|
ft2232_speed(jtag_speed_var);
|
||||||
|
|
|
@ -477,7 +477,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
|
||||||
}
|
}
|
||||||
|
|
||||||
parport_toggling_time_ns = ns;
|
parport_toggling_time_ns = ns;
|
||||||
int retval = jtag_get_speed(&wait_states);
|
retval = jtag_get_speed(&wait_states);
|
||||||
if (retval != ERROR_OK)
|
if (retval != ERROR_OK)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue