mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Call sanei_usb_init only once.

merge-requests/1/head
Henning Geinitz 2003-02-22 15:45:51 +00:00
rodzic 99a1cf050f
commit 08af36a2e8
2 zmienionych plików z 8 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
ChangeLog
Wyświetl plik

@ -9,6 +9,7 @@
in sane_init to avoid segmentation faults when sane_init/sane_exit is in sane_init to avoid segmentation faults when sane_init/sane_exit is
run more than once. run more than once.
* doc/descriptions-external/ibm.desc: Add Ricoh IS-420. * doc/descriptions-external/ibm.desc: Add Ricoh IS-420.
* sanei/sanei_usb.c: Call sanei_usb_init only once.
2003-02-20 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-02-20 Henning Meier-Geinitz <henning@meier-geinitz.de>

8
sanei/sanei_usb.c
Wyświetl plik

@ -129,6 +129,7 @@ struct ctrlmsg_ioctl
cmsg; cmsg;
#endif /* __linux__ */ #endif /* __linux__ */
static SANE_Bool inited = SANE_FALSE;
static void static void
kernel_get_vendor_product (int fd, int *vendorID, int *productID) kernel_get_vendor_product (int fd, int *vendorID, int *productID)
@ -173,6 +174,11 @@ sanei_usb_init (void)
struct usb_device *dev; struct usb_device *dev;
#endif /* HAVE_LIBUSB */ #endif /* HAVE_LIBUSB */
if (inited)
return SANE_STATUS_GOOD;
inited = SANE_TRUE;
DBG_INIT (); DBG_INIT ();
memset (devices, 0, sizeof (devices)); memset (devices, 0, sizeof (devices));
@ -213,7 +219,7 @@ sanei_usb_init (void)
fd = open (devname, O_RDWR); fd = open (devname, O_RDWR);
if (fd < 0) if (fd < 0)
{ {
DBG(5, "sanei_usb_init: couldn't open %s: %s\n", devname, DBG (5, "sanei_usb_init: couldn't open %s: %s\n", devname,
strerror (errno)); strerror (errno));
continue; continue;
} }