From 11274d22839b1e4bf31989682585017ded2ecf03 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Tue, 24 Jun 2014 09:33:05 +0900 Subject: [PATCH] drivers/cmsis_dap_usb: Return with ERROR_FAIL if no CMSIS-DAP device is found. Even if it does not return, the initialization will be failed. But it is better to show why the error is caused. Change-Id: I399c7c94a7156be22723a9715e594061bb414a7e Signed-off-by: Masaki Muranaka Reviewed-on: http://openocd.zylin.com/2189 Tested-by: jenkins Reviewed-by: Andrey Yurovsky Reviewed-by: Spencer Oliver --- src/jtag/drivers/cmsis_dap_usb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c index 4073d215..b8f004c4 100644 --- a/src/jtag/drivers/cmsis_dap_usb.c +++ b/src/jtag/drivers/cmsis_dap_usb.c @@ -208,6 +208,11 @@ static int cmsis_dap_usb_open(void) hid_free_enumeration(devs); + if (target_vid == 0 && target_pid == 0) { + LOG_ERROR("unable to find CMSIS-DAP device"); + return ERROR_FAIL; + } + if (hid_init() != 0) { LOG_ERROR("unable to open HIDAPI"); return ERROR_FAIL; -- 2.39.5