2 files changed, 2 insertions, 3 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c
index df4afeb9..0fbd327f 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1315,7 +1315,6 @@ void jtag_tap_free(struct jtag_tap *tap)
 	free(tap->chip);
 	free(tap->tapname);
 	free(tap->dotted_name);
-	free(tap->dap);
 	free(tap);
 }
 
@@ -1487,6 +1486,8 @@ int adapter_quit(void)
 		t = n;
 	}
 
+	dap_cleanup_all();
+
 	return ERROR_OK;
 }
 
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 751facb1..a6891c03 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -153,8 +153,6 @@ struct jtag_tap {
 	struct jtag_tap_event_action *event_action;
 
 	struct jtag_tap *next_tap;
-	/* dap instance if some null if no instance , initialized to 0 by calloc*/
-	struct adiv5_dap *dap;
 	/* private pointer to support none-jtag specific functions */
 	void *priv;
 };