From 12cd81bdb3e9d72f8a9abb430342ab9532e7dab1 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 22 Apr 2022 08:58:38 -0700 Subject: [PATCH] GCAdapter: don't call libusb_detach_kernel_driver on apple --- Source/Core/InputCommon/GCAdapter.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 6c6e4933bc..209594a59c 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -339,8 +339,12 @@ static bool CheckDeviceAccess(libusb_device* device) ret = libusb_kernel_driver_active(s_handle, 0); if (ret == 1) { + // On macos detaching would fail without root or entitlement. + // We assume user is using GCAdapterDriver and therefor don't want to detach anything +#if !defined(__APPLE__) ret = libusb_detach_kernel_driver(s_handle, 0); detach_failed = ret < 0 && ret != LIBUSB_ERROR_NOT_FOUND && ret != LIBUSB_ERROR_NOT_SUPPORTED; +#endif if (detach_failed) ERROR_LOG_FMT(CONTROLLERINTERFACE, "libusb_detach_kernel_driver failed with error: {}", ret); }