* [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: epson2fixes-1.0.19.patch
@ 2008-08-01 15:18 Patrick Kursawe (phosphan)
0 siblings, 0 replies; only message in thread
From: Patrick Kursawe (phosphan) @ 2008-08-01 15:18 UTC (permalink / raw
To: gentoo-commits
phosphan 08/08/01 15:18:24
Added: epson2fixes-1.0.19.patch
Log:
Included epson2 related fixes from SANE cvs
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 media-gfx/sane-backends/files/epson2fixes-1.0.19.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch?rev=1.1&content-type=text/plain
Index: epson2fixes-1.0.19.patch
===================================================================
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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-08-01 15:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-01 15:18 [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: epson2fixes-1.0.19.patch Patrick Kursawe (phosphan)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox