diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2008-08-01 15:18:24 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2008-08-01 15:18:24 +0000 |
| commit | c776535d7296184b6f3cffd1a5e13e1ce16875bf (patch) | |
| tree | e5cff21de1f2f2a277975319550d176e2a90c4f0 /media-gfx/sane-backends/files | |
| parent | Initial commit (diff) | |
| download | historical-c776535d7296184b6f3cffd1a5e13e1ce16875bf.tar.gz historical-c776535d7296184b6f3cffd1a5e13e1ce16875bf.tar.bz2 historical-c776535d7296184b6f3cffd1a5e13e1ce16875bf.zip | |
Included epson2 related fixes from SANE cvs
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'media-gfx/sane-backends/files')
| -rw-r--r-- | media-gfx/sane-backends/files/epson2fixes-1.0.19.patch | 41 |
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; + } |