openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

usb_device.c: remove LIBUSB() wrapper around call that may fail

Browse Source 
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 <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/74537
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Nikolai Artemiev 2023-04-19 17:05:25 +10:00 committed by Edward O'Callaghan
parent 67ca4a71c4
commit ba18f3e58e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usb_device.c
View File

@ -342,8 +342,8 @@ int usb_device_claim(struct usb_device *device)
} }
} }
ret = LIBUSB(libusb_detach_kernel_driver(device->handle, ret = libusb_detach_kernel_driver(device->handle,
device->interface_descriptor->bInterfaceNumber)); device->interface_descriptor->bInterfaceNumber);
if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND && ret != LIBUSB_ERROR_NOT_SUPPORTED) { if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND && ret != LIBUSB_ERROR_NOT_SUPPORTED) {
msg_perr("Cannot detach the existing usb driver. %s\n", msg_perr("Cannot detach the existing usb driver. %s\n",
libusb_error_name(ret)); libusb_error_name(ret));