From 816f5cd2ecb24d72753fed01597a81e031398446 Mon Sep 17 00:00:00 2001
From: Michael Gernoth <michael@gernoth.net>
Date: Thu, 30 May 2013 00:05:35 +0200
Subject: [PATCH] make sure errno is always correct when returning from
 hmcfgusb_poll

---
 hmcfgusb.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/hmcfgusb.c b/hmcfgusb.c
index c3fb60b..ace2e57 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -152,16 +152,12 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 		return 0;
 	}
 
-	usleep(1000);
-
 	if (done) {
 		err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, 0, &cnt, USB_TIMEOUT);
 		if (err) {
 			fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
 			return 0;
 		}
-
-		usleep(1000);
 	}
 
 	return 1;
@@ -374,6 +370,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000);
 		if (n < 0) {
 			perror("poll");
+			errno = 0;
 			return -1;
 		} else if (n == 0) {
 			usb_event = 1;
@@ -384,6 +381,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 						usb_event = 1;
 						break;
 					} else {
+						errno = 0;
 						return dev->pfd[fd_n].fd;
 					}
 				}
@@ -401,8 +399,11 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 		}
 	}
 
-	if (quit)
+	errno = 0;
+	if (quit) {
+		fprintf(stderr, "closing device-connection due to error %d\n", quit);
 		errno = quit;
+	}
 
 	return -1;
 }
-- 
2.39.5