]> git.gag.com Git - fw/openocd/commitdiff
openocd: fix cleanup order: cti before dap
authorAntonio Borneo <borneo.antonio@gmail.com>
Wed, 4 Aug 2021 22:22:06 +0000 (00:22 +0200)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sat, 14 Aug 2021 12:30:56 +0000 (13:30 +0100)
cti access is based on dap.
During cleanup, drop cti before dropping dap to guarantee that cti
can still access its dap.

Change-Id: I40c7f67d4d4a32f53802c0ce7668a5321a05893c
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6414
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
src/openocd.c

index 2c94666243d724e8961d30b4e5f6b711a1c23e13..b4571b46499e9c6781c027be68c60c0221c7c81d 100644 (file)
@@ -364,8 +364,8 @@ int openocd_main(int argc, char *argv[])
        help_del_all_commands(cmd_ctx);
 
        /* free all DAP and CTI objects */
-       dap_cleanup_all();
        arm_cti_cleanup_all();
+       dap_cleanup_all();
 
        adapter_quit();