From 83ab5ad2408c7d67ea490986f887c432f229e0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Thu, 31 Mar 2011 23:39:10 +0200 Subject: [PATCH] mips: mips_ejtag_get_impcode error propagation added MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Øyvind Harboe --- src/target/mips_ejtag.c | 5 ++++- src/target/mips_m4k.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index 8e1404f18..f9eaef197 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -261,8 +261,11 @@ int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg) int mips_ejtag_init(struct mips_ejtag *ejtag_info) { uint32_t ejtag_version; + int retval; - mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode); + retval = mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode); + if (retval != ERROR_OK) + return retval; LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode); /* get ejtag version */ diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 3a79273b2..0508c35f8 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -940,7 +940,9 @@ static int mips_m4k_examine(struct target *target) if (!target_was_examined(target)) { - mips_ejtag_get_idcode(ejtag_info, &idcode); + retval = mips_ejtag_get_idcode(ejtag_info, &idcode); + if (retval != ERROR_OK) + return retval; ejtag_info->idcode = idcode; if (((idcode >> 1) & 0x7FF) == 0x29)