target: fix messages and return values of failed op because not halted

[openocd.git] / src / target / arm920t.c

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index f4c3f425070f83a1b255c751f02c3ec08e4f7a84..53b4d9d15f3ac6240f81c7fef9b8e9a6de46fa57 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -533,8 +533,8 @@ int arm920t_arch_state(struct target *target)
 static int arm920_mmu(struct target *target, int *enabled)
 {
        if (target->state != TARGET_HALTED) {
-               LOG_ERROR("%s: target not halted", __func__);
-               return ERROR_TARGET_INVALID;
+               LOG_TARGET_ERROR(target, "not halted");
+               return ERROR_TARGET_NOT_HALTED;
        }
 
        *enabled = target_to_arm920(target)->armv4_5_mmu.mmu_enabled;
@@ -1455,9 +1455,9 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
                return retval;
 
        if (target->state != TARGET_HALTED) {
-               command_print(CMD, "target must be stopped for "
+               command_print(CMD, "Error: target must be stopped for "
                        "\"%s\" command", CMD_NAME);
-               return ERROR_OK;
+               return ERROR_TARGET_NOT_HALTED;
        }
 
        /* one argument, read a register.