EOF isn't an usb timeout error

- this fixes usb communication problems e.g. with OpenSuse
- revoke parts of 3c5cc2a and cea03f3
merge-requests/1/head
Rolf Bensch 2015-08-07 23:19:33 +02:00
rodzic b331cd5bbc
commit 3133c5e17a
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -575,7 +575,7 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
#endif
error = map_error (sanei_usb_read_int (io->dev, buf, &count));
}
if (error == PIXMA_EIO || error == PIXMA_EOF)
if (error == PIXMA_EIO /*|| error == PIXMA_EOF*/) /* EOF isn't an error! */
error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */
if (error == 0)
error = count;