target/cortex_m: prevent segmentation fault in cortex_m_poll()

[fw/openocd] / src / rtos / mqx.c

diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index 777d23ce35e19a63dd28f75a574b7f21071ee0a3..a724db0039000193e5818d1b3f8ea5a5d8ecdf38 100644 (file)
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2014 by Marian Cingel                                   *
  *   cingel.marian@gmail.com                                               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -260,7 +249,7 @@ static int mqx_create(
 {
        /* check target name against supported architectures */
        for (unsigned int i = 0; i < ARRAY_SIZE(mqx_params_list); i++) {
-               if (0 == strcmp(mqx_params_list[i].target_name, target->type->name)) {
+               if (strcmp(mqx_params_list[i].target_name, target->type->name) == 0) {
                        target->rtos->rtos_specific_params = (void *)&mqx_params_list[i];
                        /* LOG_DEBUG("MQX RTOS - valid architecture: %s", target->type->name); */
                        return 0;
@@ -291,7 +280,7 @@ static int mqx_update_threads(
        /* clear old data */
        rtos_free_threadlist(rtos);
        /* check scheduler */
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)
@@ -438,7 +427,7 @@ static int mqx_get_thread_reg_list(
                LOG_ERROR("MQX RTOS - invalid threadid: 0x%X", (int)thread_id);
                return ERROR_FAIL;
        }
-       if (ERROR_OK != mqx_is_scheduler_running(rtos))
+       if (mqx_is_scheduler_running(rtos) != ERROR_OK)
                return ERROR_FAIL;
        /* get kernel_data symbol */
        if (mqx_get_symbol(rtos, MQX_VAL_MQX_KERNEL_DATA, &kernel_data_addr) != ERROR_OK)