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:01:26 +0000 |
| commit | 3789ce9b63330c514ba78cf693f75e6be6afc9c0 (patch) | |
| tree | db5acc30f17ca51abd013e9f52af59b93dd97d6c | |
| parent | 4f6aa94f00404dae91cb90520d8d411903c7d4b5 (diff) | |
| download | flashrom-3789ce9b63330c514ba78cf693f75e6be6afc9c0.tar.gz flashrom-3789ce9b63330c514ba78cf693f75e6be6afc9c0.tar.bz2 flashrom-3789ce9b63330c514ba78cf693f75e6be6afc9c0.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/+/67846
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
| -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 4354025ea..1d1f08c1f 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -119,14 +119,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; } |