X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fbreakpoints.c;h=58bcc8615906d59de807ba6c192b522dbcb6d86a;hp=7cf4a6957e13e082114a4f03ca788ed808431dc7;hb=9f021c2bc129f8f7c659c64ad19531bd8073264a;hpb=47b8cf84202bf792cf66fbfa01169e9592236b8a

diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 7cf4a6957e..58bcc86159 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -315,11 +315,8 @@ int breakpoint_remove_internal(struct target *target, target_addr_t address)
 	struct breakpoint *breakpoint = target->breakpoints;
 
 	while (breakpoint) {
-		if ((breakpoint->address == address) && (breakpoint->asid == 0))
-			break;
-		else if ((breakpoint->address == 0) && (breakpoint->asid == address))
-			break;
-		else if ((breakpoint->address == address) && (breakpoint->asid != 0))
+		if ((breakpoint->address == address) ||
+		    (breakpoint->address == 0 && breakpoint->asid == address))
 			break;
 		breakpoint = breakpoint->next;
 	}