From 1b8091d253fb7deb2b8d63e0da0371034bacba40 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Thu, 4 Oct 2018 17:54:19 +0200 Subject: [PATCH] libusb0: return oocd error values Commit d1b74376336814266236054f925a9964b87dd8a5 fixes libusb1 to return OpenOCD error values instead of negative errors in Linux kernel's style. The same fix should be applied to libusb0 too. Fix return value of libusb0 to uniform it to OpenOCD style. Change-Id: I68478c29c91c6be720074f58c432fe51477e03ed Fixes: d1b743763368 ("libusb: return oocd error values") Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/4698 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/drivers/libusb0_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c index 1825543e2..9cf85b70e 100644 --- a/src/jtag/drivers/libusb0_common.c +++ b/src/jtag/drivers/libusb0_common.c @@ -67,7 +67,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[], const char *serial, struct jtag_libusb_device_handle **out) { - int retval = -ENODEV; + int retval = ERROR_FAIL; struct jtag_libusb_device_handle *libusb_handle; usb_init(); @@ -83,7 +83,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[], libusb_handle = usb_open(dev); if (NULL == libusb_handle) { - retval = -errno; + LOG_ERROR("usb_open() failed with %s", usb_strerror()); continue; } @@ -94,7 +94,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[], continue; } *out = libusb_handle; - retval = 0; + retval = ERROR_OK; break; } }