diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2019-07-18 14:00:13 +0200 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-09-29 17:03:38 +0000 |
| commit | a7d077cb193bdc60d1ce75940476c416f33d46ad (patch) | |
| tree | 11e59955e9bbb197b30f93988f0fca9f0716bf40 | |
| parent | 2386e94850149aea3f5a7d0962f77b6d74d060ec (diff) | |
| download | flashrom-a7d077cb193bdc60d1ce75940476c416f33d46ad.tar.gz flashrom-a7d077cb193bdc60d1ce75940476c416f33d46ad.tar.bz2 flashrom-a7d077cb193bdc60d1ce75940476c416f33d46ad.zip | |
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.
Backported to libusb-v0 version (checking for CMD_LENGTH
instead of 0 return value).
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
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67838
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | pickit2_spi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pickit2_spi.c b/pickit2_spi.c index 102fe3767..bae0aa1e3 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -123,14 +123,20 @@ static int pickit2_get_firmware_version(void) uint8_t command[CMD_LENGTH] = {CMD_GET_VERSION, CMD_END_OF_BUFFER}; ret = usb_interrupt_write(pickit2_handle, ENDPOINT_OUT, (char *)command, CMD_LENGTH, DFLT_TIMEOUT); + + if (ret != CMD_LENGTH) { + msg_perr("Command Get Firmware Version failed!\n"); + return 1; + } + ret = usb_interrupt_read(pickit2_handle, ENDPOINT_IN, (char *)command, CMD_LENGTH, DFLT_TIMEOUT); - msg_pdbg("PICkit2 Firmware Version: %d.%d\n", (int)command[0], (int)command[1]); if (ret != CMD_LENGTH) { msg_perr("Command Get Firmware Version failed (%s)!\n", usb_strerror()); return 1; } + msg_pdbg("PICkit2 Firmware Version: %d.%d\n", (int)command[0], (int)command[1]); return 0; } |