fix erroneously-resolved merge conflict
Change-Id: I4278e3e444eec93c418dfe153f60404f9848a20a Signed-off-by: Parshintsev Anatoly <anatoly.parshintsev@syntacore.com>
This commit is contained in:
parent
e9484bab54
commit
10af616067
|
@ -623,7 +623,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
|
||||||
num_found_watchpoints++;
|
num_found_watchpoints++;
|
||||||
|
|
||||||
if (status != ERROR_OK) {
|
if (status != ERROR_OK) {
|
||||||
LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
|
LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
|
||||||
retval = status;
|
retval = status;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -635,7 +635,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
|
||||||
num_found_watchpoints++;
|
num_found_watchpoints++;
|
||||||
|
|
||||||
if (retval != ERROR_OK)
|
if (retval != ERROR_OK)
|
||||||
LOG_TARGET_ERROR(target, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
|
LOG_TARGET_ERROR(target, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue