kopia lustrzana https://gitlab.com/sane-project/backends
Ignore EBUSY from usb_set_configuration. This function fails, if a different
interface of the same device is claimed (e.g. by usblp).merge-requests/1/head
rodzic
e3e00e9d91
commit
b27183004c
|
@ -9,6 +9,9 @@
|
||||||
to scanimage (based on patch from Mario Goppold
|
to scanimage (based on patch from Mario Goppold
|
||||||
<mgoppold@tbz-pariv.de>). Updated copyright information, added
|
<mgoppold@tbz-pariv.de>). Updated copyright information, added
|
||||||
links to sane-devel mailing list.
|
links to sane-devel mailing list.
|
||||||
|
* sanei/sanei_usb.c: Ignore EBUSY from usb_set_configuration. This
|
||||||
|
function fails, if a different interface of the same device is
|
||||||
|
claimed (e.g. by usblp).
|
||||||
|
|
||||||
2005-09-22 Mattias Ellert <mattias.ellert@tsl.uu.se>
|
2005-09-22 Mattias Ellert <mattias.ellert@tsl.uu.se>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* sane - Scanner Access Now Easy.
|
/* sane - Scanner Access Now Easy.
|
||||||
Copyright (C) 2003 Rene Rebe (sanei_read_int,sanei_set_timeout)
|
Copyright (C) 2003 Rene Rebe (sanei_read_int,sanei_set_timeout)
|
||||||
Copyright (C) 2001 - 2003 Henning Meier-Geinitz
|
Copyright (C) 2001 - 2005 Henning Meier-Geinitz
|
||||||
Copyright (C) 2001 Frank Zago (sanei_usb_control_msg)
|
Copyright (C) 2001 Frank Zago (sanei_usb_control_msg)
|
||||||
Copyright (C) 2005 Paul Smedley <paul@smedley.info> (OS/2 usbcalls)
|
Copyright (C) 2005 Paul Smedley <paul@smedley.info> (OS/2 usbcalls)
|
||||||
This file is part of the SANE package.
|
This file is part of the SANE package.
|
||||||
|
@ -760,12 +760,15 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
|
||||||
}
|
}
|
||||||
else if (errno == EBUSY)
|
else if (errno == EBUSY)
|
||||||
{
|
{
|
||||||
DBG (1, "Maybe the kernel scanner driver claims the "
|
DBG (3, "Maybe the kernel scanner driver or usblp claims the "
|
||||||
"scanner's interface?\n");
|
"interface? Ignoring this error...\n");
|
||||||
status = SANE_STATUS_DEVICE_BUSY;
|
status = SANE_STATUS_GOOD;
|
||||||
|
}
|
||||||
|
if (status != SANE_STATUS_GOOD)
|
||||||
|
{
|
||||||
|
usb_close (devices[devcount].libusb_handle);
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
usb_close (devices[devcount].libusb_handle);
|
|
||||||
return status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Claim the interface */
|
/* Claim the interface */
|
||||||
|
|
Ładowanie…
Reference in New Issue