From: Bert Vermeulen <redacted>
Date: Sun, 7 Apr 2013 12:14:16 +0000 (+0200)
Subject: Fix kernel driver attached check
X-Git-Tag: dsupstream~230
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=3f98bf7017341f70ceb92f98b976d972254c3ba0;p=libsigrok.git

Fix kernel driver attached check

The check is really only broken on darwin, but useful on all other
platforms, even if only Linux can actually detach a driver.
---

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 77817a71..5e551b4f 100644
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -108,9 +108,12 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 		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));