aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGirts Folkmanis <girtsf@users.noreply.github.com>2017-03-03 09:49:58 -0800
committerPaul Fertser <fercerpav@gmail.com>2017-03-06 09:58:43 +0000
commit6b2acc0243f6dd54823c336ded8c20d16cdc50a3 (patch)
tree57393b8727b71b9b1b14fa5848319b70e6c61c16
parent77189db85630cef21a4887a9b1c15dac3fd48473 (diff)
arm_dpm: fix dpm setupHEADmaster
When ARM64 support was being merged, a comparison ended up being inverted. This causes NULL pointer access when target attempts to use core cache. Change-Id: Ic8873ddd13dbdd8100856a71b4717f44cd336e23 Signed-off-by: Girts Folkmanis <opensource@girts.me> Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com> Reviewed-on: http://openocd.zylin.com/4042 Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de> Tested-by: jenkins Reviewed-by: Paul Fertser <fercerpav@gmail.com>
-rw-r--r--src/target/arm_dpm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index f15bff7..3e8180c 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -973,7 +973,7 @@ int arm_dpm_setup(struct arm_dpm *dpm)
arm->read_core_reg = arm_dpm_read_core_reg;
arm->write_core_reg = arm_dpm_write_core_reg;
- if (arm->core_cache != NULL) {
+ if (arm->core_cache == NULL) {
cache = arm_build_reg_cache(target, arm);
if (!cache)
return ERROR_FAIL;