Nico Huber submitted this change.
ch341a_spi: replace active kernel driver detaching by automatic one
Let libusb_claim_interface() handle the kernel driver detaching for us
by allowing automatic kernel driver detachment. Allow this on all
platforms.
Change-Id: If6f19744503055ab8e22c863b31e696808e0407d
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/57889
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M ch341a_spi.c
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/ch341a_spi.c b/ch341a_spi.c
index 4a76286..48642f3 100644
--- a/ch341a_spi.c
+++ b/ch341a_spi.c
@@ -20,7 +20,6 @@
#include <string.h>
#include <libusb.h>
#include "flash.h"
-#include "platform.h"
#include "programmer.h"
/* LIBUSB_CALL ensures the right calling conventions on libusb callbacks.
@@ -448,17 +447,11 @@
return -1;
}
-/* libusb_detach_kernel_driver() and friends basically only work on Linux. We simply try to detach on Linux
- * without a lot of passion here. If that works fine else we will fail on claiming the interface anyway. */
-#if IS_LINUX
- ret = libusb_detach_kernel_driver(handle, 0);
- if (ret == LIBUSB_ERROR_NOT_SUPPORTED) {
- msg_pwarn("Detaching kernel drivers is not supported. Further accesses may fail.\n");
- } else if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND) {
- msg_pwarn("Failed to detach kernel driver: '%s'. Further accesses will probably fail.\n",
- libusb_error_name(ret));
+ ret = libusb_set_auto_detach_kernel_driver(handle, 1);
+ if (ret != 0) {
+ msg_pwarn("Platform does not support detaching of USB kernel drivers.\n"
+ "If an unsupported driver is active, claiming of the interface may fail.\n");
}
-#endif
ret = libusb_claim_interface(handle, 0);
if (ret != 0) {
To view, visit change 57889. To unsubscribe, or for help writing mail filters, visit settings.