Merge pull request #8200 from randomstuff/detach_driver

Automatically detach/reattach bluetooth driver in passthrough
This commit is contained in:
Léo Lam 2019-06-29 08:46:59 +02:00 committed by GitHub
commit 75b2b53be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions

View File

@ -555,11 +555,16 @@ bool BluetoothReal::OpenDevice(libusb_device* device)
// Detaching always fails as a regular user on FreeBSD // Detaching always fails as a regular user on FreeBSD
// https://lists.freebsd.org/pipermail/freebsd-usb/2016-March/014161.html // https://lists.freebsd.org/pipermail/freebsd-usb/2016-March/014161.html
#ifndef __FreeBSD__ #ifndef __FreeBSD__
const int result = libusb_detach_kernel_driver(m_handle, INTERFACE); int result = libusb_set_auto_detach_kernel_driver(m_handle, 1);
if (result < 0 && result != LIBUSB_ERROR_NOT_FOUND && result != LIBUSB_ERROR_NOT_SUPPORTED) if (result != 0)
{ {
PanicAlertT("Failed to detach kernel driver for BT passthrough: %s", libusb_error_name(result)); result = libusb_detach_kernel_driver(m_handle, INTERFACE);
return false; if (result < 0 && result != LIBUSB_ERROR_NOT_FOUND && result != LIBUSB_ERROR_NOT_SUPPORTED)
{
PanicAlertT("Failed to detach kernel driver for BT passthrough: %s",
libusb_error_name(result));
return false;
}
} }
#endif #endif
if (libusb_claim_interface(m_handle, INTERFACE) < 0) if (libusb_claim_interface(m_handle, INTERFACE) < 0)