D54296.1777651543.diff
No OneTemporary
Actions

Size

1007 B

Referenced Files

None

Subscribers

None

D54296.1777651543.diff
View Options

	diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
	--- a/lib/libusb/libusb10.c
	+++ b/lib/libusb/libusb10.c
	@@ -639,7 +639,20 @@
	err = libusb20_dev_open(pdev, LIBUSB_NUM_SW_ENDPOINTS);
	if (err) {
	libusb_unref_device(dev);
	- return (LIBUSB_ERROR_NO_MEM);
	+ switch (err) {
	+ /*
	+ * These are all equal in value to
	+ * their LIBUSB_ERROR_* counterparts.
	+ */
	+ case LIBUSB20_ERROR_ACCESS:
	+ case LIBUSB20_ERROR_BUSY:
	+ case LIBUSB20_ERROR_INVALID_PARAM:
	+ case LIBUSB20_ERROR_NO_DEVICE:
	+ case LIBUSB20_ERROR_NO_MEM:
	+ return (err);
	+ default:
	+ return (LIBUSB_ERROR_OTHER);
	+ }
	}

	/*
	diff --git a/lib/libusb/libusb20_ugen20.c b/lib/libusb/libusb20_ugen20.c
	--- a/lib/libusb/libusb20_ugen20.c
	+++ b/lib/libusb/libusb20_ugen20.c
	@@ -393,7 +393,7 @@
	*/
	g = open(buf, O_RDWR);
	if (g < 0) {
	- return (LIBUSB20_ERROR_NO_DEVICE);
	+ return ((EACCES == errno) ? LIBUSB20_ERROR_ACCESS : LIBUSB20_ERROR_NO_DEVICE);
	}
	f = open(buf, O_RDWR);
	if (f < 0) {