From 3384fb6ddae9583c2e201fc9c8a819e9df530369 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 18 Jul 2019 14:00:13 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/34403 Tested-by: Nico Huber Reviewed-by: Nico Huber --- pickit2_spi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pickit2_spi.c') diff --git a/pickit2_spi.c b/pickit2_spi.c index 6d9b28f6..52021d94 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -93,17 +93,23 @@ static int pickit2_get_firmware_version(void) { 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); + + 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); - msg_pdbg("PICkit2 Firmware Version: %d.%d\n", (int)command[0], (int)command[1]); 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; } -- cgit v1.2.3