]> git.sur5r.net Git - openocd/commitdiff
arm_dpm: fix dpm setup
authorGirts Folkmanis <girtsf@users.noreply.github.com>
Fri, 3 Mar 2017 17:49:58 +0000 (09:49 -0800)
committerPaul Fertser <fercerpav@gmail.com>
Mon, 6 Mar 2017 09:58:43 +0000 (09:58 +0000)
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>
src/target/arm_dpm.c

index f15bff7546a339ebcde361d2da76a4ad332164e5..3e8180c36db8d8d73baf8c4227609432d478903a 100644 (file)
@@ -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;