aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasaki Muranaka <monaka@monami-ya.com>2014-06-24 09:33:05 +0900
committerSpencer Oliver <spen@spen-soft.co.uk>2014-07-10 21:18:08 +0000
commit11274d22839b1e4bf31989682585017ded2ecf03 (patch)
tree8d13171ae11fb9c8ac020fcb4af0328fc63ebe58
parent915e06b3f0e389a9350da0432e2da5ff0fe4e01e (diff)
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 <monaka@monami-ya.com> Reviewed-on: http://openocd.zylin.com/2189 Tested-by: jenkins Reviewed-by: Andrey Yurovsky <yurovsky@gmail.com> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r--src/jtag/drivers/cmsis_dap_usb.c5
1 files changed, 5 insertions, 0 deletions
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;