kopia lustrzana https://gitlab.com/sane-project/backends
backend/epson2.c: fixed attach() error path.
rodzic
983e8c0eeb
commit
e16b0e2051
|
@ -1,3 +1,6 @@
|
||||||
|
2008-04-18 Alessandro Zummo <a.zummo@towertech.it>
|
||||||
|
* backend/epson2.c: fixed attach() error path.
|
||||||
|
|
||||||
2008-04-14 Nicolas Martin <nicols-guest at users.alioth.debian.org>
|
2008-04-14 Nicolas Martin <nicols-guest at users.alioth.debian.org>
|
||||||
* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
|
* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
|
||||||
doc/sane-pixma.man, doc/descriptions/pixma.desc:
|
doc/sane-pixma.man, doc/descriptions/pixma.desc:
|
||||||
|
|
|
@ -1323,7 +1323,6 @@ attach(const char *name, Epson_Device * *devp, int type)
|
||||||
if (status != SANE_STATUS_GOOD) {
|
if (status != SANE_STATUS_GOOD) {
|
||||||
DBG(1, "%s: inquiry failed: %s\n", __func__,
|
DBG(1, "%s: inquiry failed: %s\n", __func__,
|
||||||
sane_strstatus(status));
|
sane_strstatus(status));
|
||||||
close_scanner(s);
|
|
||||||
goto free;
|
goto free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1534,8 +1533,6 @@ attach(const char *name, Epson_Device * *devp, int type)
|
||||||
dev->need_reset_on_source_change = SANE_TRUE;
|
dev->need_reset_on_source_change = SANE_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
close_scanner(s);
|
|
||||||
|
|
||||||
/* we are done with this one, prepare for the next scanner */
|
/* we are done with this one, prepare for the next scanner */
|
||||||
num_devices++;
|
num_devices++;
|
||||||
dev->next = first_dev;
|
dev->next = first_dev;
|
||||||
|
@ -1545,6 +1542,7 @@ attach(const char *name, Epson_Device * *devp, int type)
|
||||||
*devp = dev;
|
*devp = dev;
|
||||||
|
|
||||||
free:
|
free:
|
||||||
|
close_scanner(s);
|
||||||
free(s);
|
free(s);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue