summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2008-08-01 15:18:24 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2008-08-01 15:18:24 +0000
commit6c2849e0383caffa1485a11e2faf7fa91a29d8ce (patch)
tree717b831416aeb619a3be431ec73ddce77ea12b65 /media-gfx/sane-backends/files
parentInitial commit (diff)
downloadgentoo-2-6c2849e0383caffa1485a11e2faf7fa91a29d8ce.tar.gz
gentoo-2-6c2849e0383caffa1485a11e2faf7fa91a29d8ce.tar.bz2
gentoo-2-6c2849e0383caffa1485a11e2faf7fa91a29d8ce.zip
Included epson2 related fixes from SANE cvs
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-gfx/sane-backends/files')
-rw-r--r--media-gfx/sane-backends/files/epson2fixes-1.0.19.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch
new file mode 100644
index 000000000000..a32f207f328c
--- /dev/null
+++ b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch
@@ -0,0 +1,41 @@
+Index: epson2.c
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/epson2.c,v
+retrieving revision 1.15
+retrieving revision 1.17
+diff -u -r1.15 -r1.17
+--- backend/epson2.c 3 Feb 2008 12:09:09 -0000 1.15
++++ backend/epson2.c 3 May 2008 14:43:07 -0000 1.17
+@@ -1243,6 +1243,7 @@
+ * set dummy values.
+ */
+
++ s->fd = -1;
+ s->hw = dev;
+
+ dev->name = NULL;
+@@ -1323,7 +1324,6 @@
+ if (status != SANE_STATUS_GOOD) {
+ DBG(1, "%s: inquiry failed: %s\n", __func__,
+ sane_strstatus(status));
+- close_scanner(s);
+ goto free;
+ }
+
+@@ -1534,8 +1534,6 @@
+ dev->need_reset_on_source_change = SANE_TRUE;
+ }
+
+- close_scanner(s);
+-
+ /* we are done with this one, prepare for the next scanner */
+ num_devices++;
+ dev->next = first_dev;
+@@ -1545,6 +1543,7 @@
+ *devp = dev;
+
+ free:
++ close_scanner(s);
+ free(s);
+ return status;
+ }