use minimum tiemout value from call/libusb

[hmcfgusb] / hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 5939dd61cd7ba9cc345f1aa9b74343ab72c21c3f..65b47637a5193bf89a70deffb671236ff6fdea85 100644 (file)
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -183,8 +183,7 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
        msec = ((tv_end.tv_sec-tv_start.tv_sec)*1000)+((tv_end.tv_usec-tv_start.tv_usec)/1000);
 
        if (msec > 100) {
-               if (debug)
-                       fprintf(stderr, "usb-transfer took more than 100ms (%dms), this can lead to timing problems!\n", msec);
+               fprintf(stderr, "usb-transfer took more than 100ms (%dms), this may lead to timing problems!\n", msec);
        } else if (debug) {
                fprintf(stderr, "usb-transfer took %dms!\n", msec);
        }
@@ -408,6 +407,9 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
        } else {
                if ((tv.tv_sec == 0) && (tv.tv_usec == 0)) {
                        usb_event = 1;
+               } else if (tv.tv_sec > timeout) {
+                       tv.tv_sec = timeout;
+                       tv.tv_usec = 0;
                }
        }