zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libusb0: return oocd error values 

Commit d1b7437633 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: d1b7437633 ("libusb: return oocd error values")
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4698
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
log_output
Antonio Borneo 2018-10-04 17:54:19 +02:00 committed by Tomas Vanek
parent 3799eded67
commit 1b8091d253
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jtag/drivers/libusb0_common.c
View File

@ -67,7 +67,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
const char *serial, const char *serial,
struct jtag_libusb_device_handle **out) struct jtag_libusb_device_handle **out)
{ {
int retval = -ENODEV; int retval = ERROR_FAIL;
struct jtag_libusb_device_handle *libusb_handle; struct jtag_libusb_device_handle *libusb_handle;
usb_init(); usb_init();
@ -83,7 +83,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
libusb_handle = usb_open(dev); libusb_handle = usb_open(dev);
if (NULL == libusb_handle) { if (NULL == libusb_handle) {
retval = -errno; LOG_ERROR("usb_open() failed with %s", usb_strerror());
continue; continue;
} }
@ -94,7 +94,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
continue; continue;
} }
*out = libusb_handle; *out = libusb_handle;
retval = 0; retval = ERROR_OK;
break; break;
} }
} }