| 1 |
phosphan 08/08/01 15:18:24 |
| 2 |
|
| 3 |
Added: epson2fixes-1.0.19.patch |
| 4 |
Log: |
| 5 |
Included epson2 related fixes from SANE cvs |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-gfx/sane-backends/files/epson2fixes-1.0.19.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch?rev=1.1&view=markup |
| 12 |
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 |
| 13 |
|
| 14 |
Index: epson2fixes-1.0.19.patch |
| 15 |
=================================================================== |
| 16 |
Index: epson2.c |
| 17 |
=================================================================== |
| 18 |
RCS file: /cvsroot/sane/sane-backends/backend/epson2.c,v |
| 19 |
retrieving revision 1.15 |
| 20 |
retrieving revision 1.17 |
| 21 |
diff -u -r1.15 -r1.17 |
| 22 |
--- backend/epson2.c 3 Feb 2008 12:09:09 -0000 1.15 |
| 23 |
+++ backend/epson2.c 3 May 2008 14:43:07 -0000 1.17 |
| 24 |
@@ -1243,6 +1243,7 @@ |
| 25 |
* set dummy values. |
| 26 |
*/ |
| 27 |
|
| 28 |
+ s->fd = -1; |
| 29 |
s->hw = dev; |
| 30 |
|
| 31 |
dev->name = NULL; |
| 32 |
@@ -1323,7 +1324,6 @@ |
| 33 |
if (status != SANE_STATUS_GOOD) { |
| 34 |
DBG(1, "%s: inquiry failed: %s\n", __func__, |
| 35 |
sane_strstatus(status)); |
| 36 |
- close_scanner(s); |
| 37 |
goto free; |
| 38 |
} |
| 39 |
|
| 40 |
@@ -1534,8 +1534,6 @@ |
| 41 |
dev->need_reset_on_source_change = SANE_TRUE; |
| 42 |
} |
| 43 |
|
| 44 |
- close_scanner(s); |
| 45 |
- |
| 46 |
/* we are done with this one, prepare for the next scanner */ |
| 47 |
num_devices++; |
| 48 |
dev->next = first_dev; |
| 49 |
@@ -1545,6 +1543,7 @@ |
| 50 |
*devp = dev; |
| 51 |
|
| 52 |
free: |
| 53 |
+ close_scanner(s); |
| 54 |
free(s); |
| 55 |
return status; |
| 56 |
} |
Archives