From: Tomas Vanek <vanekt@fbl.cz>
Date: Wed, 14 Feb 2018 18:47:06 +0000 (+0100)
Subject: flash/nor/psoc4: fix warnings
X-Git-Tag: v0.11.0-rc1~1211
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=66686284311961cab48172b948180d2958eb6ae7;hp=a088e3942300a02a7a170aa26d780dd156baf0b4

flash/nor/psoc4: fix warnings

Reported by Clang static analyzer.

Change-Id: I1118f303f468b6a78ec6cba692762aee565bdf9e
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4407
Tested-by: jenkins
---

diff --git a/src/flash/nor/psoc4.c b/src/flash/nor/psoc4.c
index d4ce1fb02b..62b904ed12 100644
--- a/src/flash/nor/psoc4.c
+++ b/src/flash/nor/psoc4.c
@@ -276,8 +276,8 @@ static int psoc4_sysreq(struct flash_bank *bank, uint8_t cmd,
 	}
 
 	if (sysreq_params_size) {
-		LOG_DEBUG("SYSREQ %02" PRIx8 " %04" PRIx16 " %08" PRIx32 " %08" PRIx32 " size %" PRIu32,
-			cmd, cmd_param, param1, sysreq_params[0], sysreq_params_size);
+		LOG_DEBUG("SYSREQ %02" PRIx8 " %04" PRIx16 " %08" PRIx32 " size %" PRIu32,
+			cmd, cmd_param, param1, sysreq_params_size);
 		/* Allocate memory for sysreq_params */
 		retval = target_alloc_working_area(target, sysreq_params_size, &sysreq_mem);
 		if (retval != ERROR_OK) {
@@ -323,6 +323,7 @@ static int psoc4_sysreq(struct flash_bank *bank, uint8_t cmd,
 	if (armv7m == NULL) {
 		/* something is very wrong if armv7m is NULL */
 		LOG_ERROR("unable to get armv7m target");
+		retval = ERROR_FAIL;
 		goto cleanup;
 	}