Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/34403 )
Change subject: pickit2_spi: Fix "dead" assignment ......................................................................
pickit2_spi: Fix "dead" assignment
We never read the first 'ret'. Let's check the first 'ret' and exit if it failed.
Also, print the version only when the command succeeded.
Found-by: scan-build 7.0.1-8 Change-Id: I4aac5e1f3bd0604b079e1fdd9b7f09f1f4fc2d7f Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/flashrom/+/34403 Tested-by: Nico Huber nico.h@gmx.de Reviewed-by: Nico Huber nico.h@gmx.de --- M pickit2_spi.c 1 file changed, 10 insertions(+), 4 deletions(-)
Approvals: Nico Huber: Verified; Looks good to me, approved
diff --git a/pickit2_spi.c b/pickit2_spi.c index 6d9b28f..52021d9 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -93,17 +93,23 @@ { int ret; uint8_t command[CMD_LENGTH] = {CMD_GET_VERSION, CMD_END_OF_BUFFER}; - int transferred; - ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT); - ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_IN, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT);
- msg_pdbg("PICkit2 Firmware Version: %d.%d\n", (int)command[0], (int)command[1]); + ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_OUT, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT); + if (ret != 0) { msg_perr("Command Get Firmware Version failed!\n"); return 1; }
+ ret = libusb_interrupt_transfer(pickit2_handle, ENDPOINT_IN, command, CMD_LENGTH, &transferred, DFLT_TIMEOUT); + + if (ret != 0) { + msg_perr("Command Get Firmware Version failed!\n"); + return 1; + } + + msg_pdbg("PICkit2 Firmware Version: %d.%d\n", (int)command[0], (int)command[1]); return 0; }