X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/bedcaba0bd60f3ae0856fe75bf4c81c2087c0baa..1ee8653afbf410ed34f9dbc18ffe4beaf3c159e4:/flash-hmcfgusb.c

diff --git a/flash-hmcfgusb.c b/flash-hmcfgusb.c
index 244559d..a9ff876 100644
--- a/flash-hmcfgusb.c
+++ b/flash-hmcfgusb.c
@@ -93,17 +93,16 @@ int main(int argc, char **argv)
 
 	if (!dev->bootloader) {
 		fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, entering bootloader.\n");
-		hmcfgusb_enter_bootloader(dev);
 		fprintf(stderr, "\nWaiting for device to reappear...\n");
 
 		do {
-			sleep(2);
-		} while ((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL);
-
-		if (!dev->bootloader) {
-			fprintf(stderr, "Can't enter bootloader, giving up!\n");
-			exit(EXIT_FAILURE);
-		}
+			if (dev) {
+				if (!dev->bootloader)
+					hmcfgusb_enter_bootloader(dev);
+				hmcfgusb_close(dev);
+			}
+			sleep(1);
+		} while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (!dev->bootloader));
 	}
 
 	printf("\nHM-CFG-USB opened.\n\n");
@@ -136,7 +135,7 @@ int main(int argc, char **argv)
 			printf("Waiting for ack...\n");
 		do {
 			errno = 0;
-			pfd = hmcfgusb_poll(dev, 1);
+			pfd = hmcfgusb_poll(dev, 1000);
 			if ((pfd < 0) && errno) {
 				if (errno != ETIMEDOUT) {
 					perror("\n\nhmcfgusb_poll");
@@ -167,6 +166,7 @@ int main(int argc, char **argv)
 	firmware_free(fw);
 
 	hmcfgusb_close(dev);
+	hmcfgusb_exit();
 
 	return EXIT_SUCCESS;
 }