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

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 985cf8c2df6337040f1930da5749dd9544284cb4..e9802e17266fda05f55bb19da067d1f781201e4b 100644 (file)
--- 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");
                if (validate_tries > 5)
                {
                        ERROR("Could not validate JTAG chain, exit");

-                       jtag = NULL;

                        return ERROR_JTAG_INVALID_INTERFACE;
                }
                usleep(10000);
                        return ERROR_JTAG_INVALID_INTERFACE;
                }
                usleep(10000);