X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fezusb.c;h=1359a3daf96d9a6472f86838ec7dc70f93acbc12;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=947fe1f834c1d7662c3a791a153c2aabdaafe8b5;hpb=d4928d7102c6b2f9f7aa51a1b98669bf148fff80;p=libsigrok.git

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 947fe1f8..1359a3da 100644
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -50,7 +50,7 @@ SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 	ret = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
 				      0xe600, 0x0000, buf, 1, 100);
 	if (ret < 0)
-		sr_err("Unable to send control request: %s",
+		sr_err("Unable to send control request: %s.",
 				libusb_error_name(ret));
 
 	return ret;
@@ -80,7 +80,7 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
 					      LIBUSB_ENDPOINT_OUT, 0xa0, offset,
 					      0x0000, buf, chunksize, 100);
 		if (ret < 0) {
-			sr_err("Unable to send firmware to device: %s",
+			sr_err("Unable to send firmware to device: %s.",
 					libusb_error_name(ret));
 			result = SR_ERR;
 			break;
@@ -104,14 +104,16 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 		libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
 	if ((ret = libusb_open(dev, &hdl)) < 0) {
-		sr_err("ezusb: failed to open device: %s",
-				libusb_error_name(ret));
+		sr_err("failed to open device: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
 
-/* Neither Windows/MinGW nor Darwin/Mac support these libusb-1.0 calls. */
-#if !defined(_WIN32) && !defined(__APPLE__)
-	if (libusb_kernel_driver_active(hdl, 0)) {
+/*
+ * The libusbx darwin backend is broken: it can report a kernel driver being
+ * active, but detaching it always returns an error.
+ */
+#if !defined(__APPLE__)
+	if (libusb_kernel_driver_active(hdl, 0) == 1) {
 		if ((ret = libusb_detach_kernel_driver(hdl, 0)) < 0) {
 			sr_err("failed to detach kernel driver: %s",
 					libusb_error_name(ret));