This is an automated email from Gerrit.

Antonio Borneo ([email protected]) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/4698

-- gerrit

commit 7e50418b1c5667150776656187f048ce0a078f43
Author: Antonio Borneo <[email protected]>
Date:   Thu Oct 4 17:54:19 2018 +0200

    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 <[email protected]>

diff --git a/src/jtag/drivers/libusb0_common.c 
b/src/jtag/drivers/libusb0_common.c
index 1825543..9cf85b7 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;
                }
        }

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to