From e8ead33804f1aede5157a5afc1bc249038799e6b Mon Sep 17 00:00:00 2001 From: drath Date: Thu, 19 Oct 2006 10:07:24 +0000 Subject: - fixed endianness handling in arm7_9_read_core_reg (thanks to Magnus Lundin for reporting this) - correctly handle ft2232_device_desc and ft2232_serial when both are given at the same time git-svn-id: svn://svn.berlios.de/openocd/trunk@104 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/ft2232.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/jtag') diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index e9fce54b..06b419a0 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -994,7 +994,8 @@ int ft2232_init(void) WARNING("can't open by device description and serial number, giving precedence to serial"); ft2232_device_desc = NULL; } - else if (ft2232_device_desc) + + if (ft2232_device_desc) { openex_string = ft2232_device_desc; openex_flags = FT_OPEN_BY_DESCRIPTION; -- cgit v1.2.3