jtag/mpsse: mpsse_flush should not treat LIBUSB_ERROR_INTERRUPTED as an error

[openocd.git] / src / jtag / drivers / usbprog.c

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 061c0161ff5271f1118e7eecadb8f983728bf979..aa655ed7e607290b04424b7bdccad4f94de0260c 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2007 by Benedikt Sauter                                 *
@@ -148,7 +148,7 @@ static int usbprog_init(void)
        usbprog_jtag_handle = usbprog_jtag_open();
 
        tms_chain_index = 0;
-       if (usbprog_jtag_handle == 0) {
+       if (!usbprog_jtag_handle) {
                LOG_ERROR("Can't find USB JTAG Interface! Please check connection and permissions.");
                return ERROR_JTAG_INIT_FAILED;
        }
@@ -335,15 +335,13 @@ static void usbprog_reset(int trst, int srst)
 
 /*************** jtag lowlevel functions ********************/
 
-struct usb_bus *busses;
-
 struct usbprog_jtag *usbprog_jtag_open(void)
 {
        const uint16_t vids[] = { VID, 0 };
        const uint16_t pids[] = { PID, 0 };
        struct libusb_device_handle *dev;
 
-       if (jtag_libusb_open(vids, pids, &dev, NULL) != ERROR_OK)
+       if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
                return NULL;
 
        struct usbprog_jtag *tmp = malloc(sizeof(struct usbprog_jtag));