EOF is a bjnp timeout error

merge-requests/1/head
Rolf Bensch 2015-08-10 23:19:58 +02:00
rodzic a9e91885b0
commit 2f4c0c16c4
1 zmienionych plików z 2 dodań i 1 usunięć

Wyświetl plik

@ -575,7 +575,8 @@ 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*/) /* EOF isn't an error! */
if (error == PIXMA_EIO ||
(io->interface == INT_BJNP && error == PIXMA_EOF)) /* EOF is a bjnp timeout error! */
error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */
if (error == 0)
error = count;