ETIMEDOUT is not a fatal error

diff --git a/firmware.c b/firmware.c
index bd13dbe2fb3bbf3b0085347b5ac5003967445260..ff4c8bece316181327e3b140d2507175f2d8376c 100644 (file)
--- a/firmware.c
+++ b/firmware.c
@@ -119,7 +119,6 @@ struct firmware* firmware_read_firmware(char *filename, int debug)
                len |= (ascii_to_nibble(buf[2]) & 0xf)<< 4;
                len |= ascii_to_nibble(buf[3]) & 0xf;
 
                len |= (ascii_to_nibble(buf[2]) & 0xf)<< 4;
                len |= ascii_to_nibble(buf[3]) & 0xf;
 

-               /* This might be wrong, but it works for current fw->fw */

                if (len > MAX_BLOCK_LENGTH) {
                        fprintf(stderr, "Invalid block-length %u > %u for block %d!\n", len, MAX_BLOCK_LENGTH, fw->fw_blocks+1);
                        exit(EXIT_FAILURE);
                if (len > MAX_BLOCK_LENGTH) {
                        fprintf(stderr, "Invalid block-length %u > %u for block %d!\n", len, MAX_BLOCK_LENGTH, fw->fw_blocks+1);
                        exit(EXIT_FAILURE);

diff --git a/flash-hmcfgusb.c b/flash-hmcfgusb.c
index 571386f8b1bc5e49acc84c84ef0d4444dac9c499..244559d6e1d61dc1cf7bd499376f1db3a80ec06b 100644 (file)
--- a/flash-hmcfgusb.c
+++ b/flash-hmcfgusb.c
@@ -138,8 +138,10 @@ int main(int argc, char **argv)
                        errno = 0;
                        pfd = hmcfgusb_poll(dev, 1);
                        if ((pfd < 0) && errno) {
                        errno = 0;
                        pfd = hmcfgusb_poll(dev, 1);
                        if ((pfd < 0) && errno) {

-                               perror("\n\nhmcfgusb_poll");
-                               exit(EXIT_FAILURE);
+                               if (errno != ETIMEDOUT) {
+                                       perror("\n\nhmcfgusb_poll");
+                                       exit(EXIT_FAILURE);
+                               }

                        }
                        if (rdata.ack) {
                                break;
                        }
                        if (rdata.ack) {
                                break;