From 361dc9c234e94a9c5c88fc2568e00f41cbb5ceb5 Mon Sep 17 00:00:00 2001
From: dragonmux <git@dragonmux.network>
Date: Fri, 21 Jan 2022 21:32:27 -0500
Subject: [PATCH] Revert "adiv5_swdp_scan: If SWD scan fails, try a JTAG scan."

This reverts commit 3df692ecb247fdc7c62f3c3dc622030ad12817e6.
---
 src/platforms/pc/cl_utils.c | 2 +-
 src/target/adiv5_swdp.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/platforms/pc/cl_utils.c b/src/platforms/pc/cl_utils.c
index 7a438da..6a20375 100644
--- a/src/platforms/pc/cl_utils.c
+++ b/src/platforms/pc/cl_utils.c
@@ -378,7 +378,7 @@ int cl_execute(BMP_CL_OPTIONS_t *opt)
 	} else {
 		num_targets = platform_adiv5_swdp_scan(opt->opt_targetid);
 		if (!num_targets) {
-			DEBUG_WARN("Scan SWD failed, trying JTAG!\n");
+			DEBUG_INFO("Scan SWD failed, trying JTAG!\n");
 			num_targets = platform_jtag_scan(NULL);
 		}
 	}
diff --git a/src/target/adiv5_swdp.c b/src/target/adiv5_swdp.c
index d29d02a..d6631c5 100644
--- a/src/target/adiv5_swdp.c
+++ b/src/target/adiv5_swdp.c
@@ -115,7 +115,7 @@ int adiv5_swdp_scan(uint32_t targetid)
 			}
 			if (e2.type || initial_dp->fault) {
 				DEBUG_WARN("No usable DP found\n");
-				return 0;
+				return -1;
 			}
 		}
 		if ((idcode & ADIV5_DP_VERSION_MASK) == ADIV5_DPv2) {