From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2015 08:20:20 +0200 Subject: merge to 1.0.25+git20150927 --- backend/pixma_io_sanei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'backend/pixma_io_sanei.c') diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c index 08ec525..9e4a2fa 100644 --- a/backend/pixma_io_sanei.c +++ b/backend/pixma_io_sanei.c @@ -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) + 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; -- cgit v1.2.3