From bf7a363b44f303f2eee73e825ba989738cf8b45d Mon Sep 17 00:00:00 2001
From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Thu, 4 Oct 2018 18:24:25 +0200
Subject: [PATCH] jtag/drivers/usb_common: return oocd error values
Where possible, keep the same style for returning error.
Change-Id: I3a04220c0b9f129a36e9fe83038b7c19dd57fe61
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4699
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---
src/jtag/drivers/usb_common.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/jtag/drivers/usb_common.c b/src/jtag/drivers/usb_common.c
index 54be6a624..1b7602d19 100644
--- a/src/jtag/drivers/usb_common.c
+++ b/src/jtag/drivers/usb_common.c
@@ -19,6 +19,7 @@
#include "config.h"
#endif
#include "usb_common.h"
+#include "log.h"
static bool jtag_usb_match(struct usb_device *dev,
@@ -45,10 +46,12 @@ int jtag_usb_open(const uint16_t vids[], const uint16_t pids[],
continue;
*out = usb_open(dev);
- if (NULL == *out)
- return -errno;
- return 0;
+ if (NULL == *out) {
+ LOG_ERROR("usb_open() failed with %s", usb_strerror());
+ return ERROR_FAIL;
+ }
+ return ERROR_OK;
}
}
- return -ENODEV;
+ return ERROR_FAIL;
}
--
GitLab