diff options
| author | Pokechu22 <Pokechu022@gmail.com> | 2022-06-08 15:27:55 -0700 |
|---|---|---|
| committer | Pokechu22 <Pokechu022@gmail.com> | 2022-06-08 15:30:22 -0700 |
| commit | 27772e01d9e263e172daf7adb379621b0499fcf9 (patch) | |
| tree | a609827814ce5e43528abdcdd54cf547c5590a25 /Source/Core/InputCommon | |
| parent | 83afaba785af8685756685472885c440897a2066 (diff) | |
GCAdapter: Compare with LIBUSB_SUCCESS instead of 0
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 993e032bf3..345559c7ac 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -71,7 +71,7 @@ enum ADAPTER_DETECTED = 1, }; -// Current adapter status: detected/not detected/in error (holds the error code) +// Current adapter status: detected/not detected/in error (libusb error codes are negative) static std::atomic<int> s_status = NO_ADAPTER_DETECTED; static libusb_device_handle* s_handle = nullptr; #elif GCADAPTER_USE_ANDROID_IMPLEMENTATION @@ -539,7 +539,8 @@ static bool CheckDeviceAccess(libusb_device* device) // 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; + detach_failed = + ret < LIBUSB_SUCCESS && ret != LIBUSB_ERROR_NOT_FOUND && ret != LIBUSB_ERROR_NOT_SUPPORTED; #endif if (detach_failed) { @@ -557,7 +558,7 @@ static bool CheckDeviceAccess(libusb_device* device) // This call makes Nyko-brand (and perhaps other) adapters work. // However it returns LIBUSB_ERROR_PIPE with Mayflash adapters. const int transfer = libusb_control_transfer(s_handle, 0x21, 11, 0x0001, 0, nullptr, 0, 1000); - if (transfer < 0) + if (transfer < LIBUSB_SUCCESS) { WARN_LOG_FMT(CONTROLLERINTERFACE, "libusb_control_transfer failed: {}", LibusbUtils::ErrorWrap(transfer)); |