libusb: idProduct of USB device may be zero

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

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index dcca8d1c7d74696aec108ca4e0a0e2ba17647867..dc6c0a7252ad7beba3a74c0f25bd4e95128f13ea 100644 (file)
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -33,7 +33,7 @@ static bool jtag_libusb_match(struct jtag_libusb_device *dev,
 {
        struct libusb_device_descriptor dev_desc;
 
-       for (unsigned i = 0; vids[i] && pids[i]; i++) {
+       for (unsigned i = 0; vids[i]; i++) {
                if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
                        if (dev_desc.idVendor == vids[i] &&
                                dev_desc.idProduct == pids[i])
@@ -74,7 +74,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 void jtag_libusb_close(jtag_libusb_device_handle *dev)
 {
        /* Close device */
-       jtag_libusb_close(dev);
+       libusb_close(dev);
 
        libusb_exit(jtag_libusb_context);
 }