diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:32:49 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:32:49 +0200 |
| commit | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (patch) | |
| tree | 56cb8849a5df91b19b72fd4f48c79c343cd9bc5e /backend/pixma_io_sanei.c | |
| parent | ba8d09abe681600aad991f4a75e904615b7ed29f (diff) | |
Imported Upstream version 1.0.25upstream/1.0.25
Diffstat (limited to 'backend/pixma_io_sanei.c')
| -rw-r--r-- | backend/pixma_io_sanei.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c index b25c7eb..9e4a2fa 100644 --- a/backend/pixma_io_sanei.c +++ b/backend/pixma_io_sanei.c @@ -1,8 +1,8 @@ /* SANE - Scanner Access Now Easy. * For limitations, see function sanei_usb_get_vendor_product(). + Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de> Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de> - Copyright (C) 2011-2013 Rolf Bensch <rolf at bensch hyphen online dot de> This file is part of the SANE package. @@ -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; |