pixma_io_sanei.c: corrected error handling for bjnp interface

merge-requests/1/head
Louis Lagendijk 2012-08-11 20:38:05 +02:00 zatwierdzone przez Louis Lagendijk
rodzic fb1b31f82a
commit cea03f3946
1 zmienionych plików z 1 dodań i 2 usunięć

Wyświetl plik

@ -567,8 +567,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
|| (io->interface == INT_USB && error == PIXMA_EOF))
if (error == PIXMA_EIO || error == PIXMA_EOF)
error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */
if (error == 0)
error = count;