Attention is currently required from: Elyes Haouas.
Hello Elyes Haouas,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/flashrom/+/67846
to review the following change.
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, 26 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/67846/1
diff --git a/pickit2_spi.c b/pickit2_spi.c index 4354025..1d1f08c 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -119,14 +119,20 @@ 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; }