X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fembeddedice.c;h=77e85df4c5956bd5ed2305f7b8be920df8ffbbbb;hp=b171dcf72f60c18217d3b61a716adc6742f6370c;hb=4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717;hpb=2615bf4398f393ee1e387128064093dcd44749c8

diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index b171dcf72f..77e85df4c5 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -497,13 +497,12 @@ static int embeddedice_set_reg_w_exec(struct reg *reg, uint8_t *buf)
 void embeddedice_write_reg(struct reg *reg, uint32_t value)
 {
 	struct embeddedice_reg *ice_reg = reg->arch_info;
-	int retval;
 
 	LOG_DEBUG("%i: 0x%8.8" PRIx32 "", ice_reg->addr, value);
 
-	retval = arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE);
+	arm_jtag_scann(ice_reg->jtag_info, 0x2, TAP_IDLE);
 
-	retval = arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE);
+	arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL, TAP_IDLE);
 
 	uint8_t reg_addr = ice_reg->addr & 0x1f;
 	embeddedice_write_reg_inner(ice_reg->jtag_info->tap, reg_addr, value);
@@ -590,7 +589,7 @@ int embeddedice_handshake(struct arm_jtag *jtag_info, int hsbit, uint32_t timeou
 	else
 	{
 		LOG_ERROR("Invalid arguments");
-		return ERROR_INVALID_ARGUMENTS;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	retval = arm_jtag_scann(jtag_info, 0x2, TAP_IDLE);