From fa4680548150b51083239e3a5181a2ecd86a0da9 Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Wed, 8 Dec 2010 19:54:10 +0000 Subject: [PATCH] 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 --- src/jtag/drivers/ft2232.c | 2 +- src/jtag/drivers/parport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index 77b5880b1f..c8a98d2d29 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 3402bc2a05..b61f2f15e4 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; } -- 2.30.2