From 5204d4fed803b8356bf268389f42d3ddeac907ea Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Wed, 8 Oct 2003 15:42:55 +0000 Subject: [PATCH] Workaround for bug in canon630u backend: The backend assumes that the id it gets back from sanei_usb_open is a file descriptor. It isn't. So sane_get_select_fd returns just a random number. That breals at least saned, other frontends may not work either. This is a workaround for bug #300257. --- ChangeLog | 9 +++++++++ backend/canon630u.c | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66f64b2cf..8b635c4cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-10-08 Henning Meier-Geinitz + + * backend/canon630u.c: Workaround for bug in canon630u backend: + The backend assumes that the id it gets back from sanei_usb_open + is a file descriptor. It isn't. So sane_get_select_fd returns + just a random number. That breals at least saned, other + frontends may not work either. This is a workaround for bug + #300257. + 2003-10-07 m. allan noah * backend/fujitsu.c: removed ~25 '_' from option names (#300139) diff --git a/backend/canon630u.c b/backend/canon630u.c index 1fb2edee8..5c521e485 100644 --- a/backend/canon630u.c +++ b/backend/canon630u.c @@ -1040,6 +1040,5 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int * fd) Canon_Scanner *scanner = handle; DBG (3, "sane_get_select_fd: handle = %p, fd %s 0\n", handle, fd ? "!=" : "="); - *fd = scanner->scan.fd; - return SANE_STATUS_GOOD; + return SANE_STATUS_UNSUPPORTED; }