be compatible with libusb-versions without dev->devnum member

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 05ba48a5424686995f1997b68c89e0650e4fdc64..27a9580a4ade4c06b27d5049edb98ef5ea773692 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -500,6 +500,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                                } else {
                                                        devnum = strtol(devstr, &remainder, 10);
                                                        if (devstr == remainder) {
+                                                               busnum = -1;
                                                                devnum = -1;
                                                        } else {
                                                                fprintf(stderr,"Using XILINX platform cable USB at %03d:%03d\n",
@@ -533,7 +534,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                                           (desc->idProduct == e->matchTables[i].ProductId) &&
                                                           (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
                                                           (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) &&
-                                                          ((devnum == -1) || (dev->devnum == devnum)) ) {
+                                                          ((devnum == -1) || (strtol(dev->filename, NULL, 10) == devnum)) ) {
                                                                   int ac;
                                                                   for (ac = 0; ac < desc->bNumConfigurations; ac++) {
                                                                           struct usb_interface *interface = dev->config[ac].interface;