From aa29f083a79fe1c2238b66bee84fd2707603e64a Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Thu, 12 Jan 2012 14:15:28 +0000 Subject: [PATCH] stlink: correctly signal stlink_interface_open failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit give the user a error msg on open failure. Change-Id: If4a57bac7f3e1746c2a05c7a96747a38da188041 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/368 Tested-by: jenkins Reviewed-by: Mathias Küster --- src/jtag/drivers/stlink_usb.c | 2 +- src/jtag/stlink/stlink_transport.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index aaf55b0a..3b262f93 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -609,7 +609,7 @@ int stlink_usb_open(struct stlink_interface_param_s *param, void **fd) param->pid); if (jtag_libusb_open(vids, pids, &h->fd) != ERROR_OK) { - LOG_DEBUG("stlink_open_usb: open failed"); + LOG_ERROR("stlink_open_usb: open failed"); return ERROR_FAIL; } diff --git a/src/jtag/stlink/stlink_transport.c b/src/jtag/stlink/stlink_transport.c index c073ffed..14e59ec7 100644 --- a/src/jtag/stlink/stlink_transport.c +++ b/src/jtag/stlink/stlink_transport.c @@ -142,10 +142,11 @@ static int stlink_transport_init(struct command_context *cmd_ctx) if (!t) { LOG_ERROR("stlink_transport_init: no current target"); return ERROR_FAIL; - } - stlink_interface_open(); + int retval = stlink_interface_open(); + if (retval != ERROR_OK) + return retval; return stlink_interface_init_target(t); } -- 2.39.5