X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Faarch64.c;h=454de9e924757c5c0f4d6432b51cf144c4974f23;hp=14542a658824367688a1b5ec654e9b4b94afeb33;hb=e59bb6c285d21ba59f785d4340048abda1c39466;hpb=9f93cca42738cf0c5060296ef5899fee53fc642f

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 14542a6588..454de9e924 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -1694,17 +1694,19 @@ static int aarch64_deassert_reset(struct target *target)
 	if (retval != ERROR_OK)
 		return retval;
 
+	retval = aarch64_init_debug_access(target);
+	if (retval != ERROR_OK)
+		return retval;
+
 	if (target->reset_halt) {
 		if (target->state != TARGET_HALTED) {
 			LOG_WARNING("%s: ran after reset and before halt ...",
 				target_name(target));
 			retval = target_halt(target);
-			if (retval != ERROR_OK)
-				return retval;
 		}
 	}
 
-	return aarch64_init_debug_access(target);
+	return retval;
 }
 
 static int aarch64_write_cpu_memory_slow(struct target *target,