From ba18f3e58e6ddd9711e96e1b2b9f5f2337bae1df Mon Sep 17 00:00:00 2001 From: Nikolai Artemiev Date: Wed, 19 Apr 2023 17:05:25 +1000 Subject: usb_device.c: remove LIBUSB() wrapper around call that may fail The libusb_detach_kernel_driver() call may return LIBUSB_ERROR_NOT_FOUND, which should not be treated as an error. Wrapping the call in LIBUSB() caused the error code to be transformed by LIBUSB_ERROR(), so LIBUSB_ERROR_NOT_FOUND was not recognized at the call site and was treated as a real error. BUG=b:278635575 TEST=flashrom -p raiden_debug_spi:target=AP BRANCH=none Change-Id: I38e4642bcbddaf3f37821093f6b919806134ed7b Signed-off-by: Nikolai Artemiev Reviewed-on: https://review.coreboot.org/c/flashrom/+/74537 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen Reviewed-by: Edward O'Callaghan --- usb_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usb_device.c b/usb_device.c index c9c8d92a..0c8e3e21 100644 --- a/usb_device.c +++ b/usb_device.c @@ -342,8 +342,8 @@ int usb_device_claim(struct usb_device *device) } } - ret = LIBUSB(libusb_detach_kernel_driver(device->handle, - device->interface_descriptor->bInterfaceNumber)); + ret = libusb_detach_kernel_driver(device->handle, + device->interface_descriptor->bInterfaceNumber); if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND && ret != LIBUSB_ERROR_NOT_SUPPORTED) { msg_perr("Cannot detach the existing usb driver. %s\n", libusb_error_name(ret)); -- cgit v1.2.3