BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Bert Vermeulen 2013-04-07 14:14:16 +02:00
parent 8c971b6e5c
commit 3f98bf7017
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/common/ezusb.c
View File

@ -108,9 +108,12 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
return SR_ERR; return SR_ERR;
} }
/* Neither Windows/MinGW nor Darwin/Mac support these libusb-1.0 calls. */ /*
#if !defined(_WIN32) && !defined(__APPLE__) * The libusbx darwin backend is broken: it can report a kernel driver being
if (libusb_kernel_driver_active(hdl, 0)) { * 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) { if ((ret = libusb_detach_kernel_driver(hdl, 0)) < 0) {
sr_err("failed to detach kernel driver: %s", sr_err("failed to detach kernel driver: %s",
libusb_error_name(ret)); libusb_error_name(ret));