summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 10:24:46 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-28 10:24:46 +0000
commit076017341dd0428bb6e2c1bf5953851d91c098dd (patch)
treed9b373e4548ceb0b861fc46219c3396170202a0b
parent9e5a6679cac36667e51f24a6bd5670396cd06ed6 (diff)
downloadopenocd_libswd-076017341dd0428bb6e2c1bf5953851d91c098dd.tar.gz
openocd_libswd-076017341dd0428bb6e2c1bf5953851d91c098dd.tar.bz2
openocd_libswd-076017341dd0428bb6e2c1bf5953851d91c098dd.tar.xz
openocd_libswd-076017341dd0428bb6e2c1bf5953851d91c098dd.zip
fix from Pavel Chromy
this patch fixes an issue in jtag_init - shall not reset jtag to NULL. This causes jtag interface (USB device) not to be closed properly if jtag chain validation fails. Once the underlaying jtag interface is initialized, jtag pointer shall be left untouched, even in case of an error, so that proper cleanup can be done, see exit_handler in openocd.c git-svn-id: svn://svn.berlios.de/openocd/trunk@372 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/jtag/jtag.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 985cf8c2..e9802e17 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1467,7 +1467,6 @@ int jtag_init(struct command_context_s *cmd_ctx)
if (validate_tries > 5)
{
ERROR("Could not validate JTAG chain, exit");
- jtag = NULL;
return ERROR_JTAG_INVALID_INTERFACE;
}
usleep(10000);