hwdriver.c: Fix two scan-build warnings.

[libsigrok.git] / src / hardware / saleae-logic-pro / protocol.c

diff --git a/src/hardware/saleae-logic-pro/protocol.c b/src/hardware/saleae-logic-pro/protocol.c
index 94cab7fbeea63405c7faf6785a7ed0cf5281a3bc..351032af39ff043f1b0ed764b9f8915fb3b39531 100644 (file)
--- a/src/hardware/saleae-logic-pro/protocol.c
+++ b/src/hardware/saleae-logic-pro/protocol.c
@@ -186,7 +186,6 @@ static int read_regs(const struct sr_dev_inst *sdi,
                     uint8_t cnt)
 {
        uint8_t req[33];
-       int i;
 
        if (cnt < 1 || cnt > 30)
                return SR_ERR_ARG;
@@ -194,10 +193,8 @@ static int read_regs(const struct sr_dev_inst *sdi,
        req[0] = 0x00;
        req[1] = COMMAND_READ_REG;
        req[2] = cnt;
-
-       for (i = 0; i < cnt; i++) {
-               req[3 + i] = regs[i];
-       }
+       if (cnt)
+               memcpy(&req[3], regs, cnt);
 
        return transact(sdi, req, 3 + cnt, values, cnt);
 }
@@ -530,8 +527,6 @@ static int upload_bitstream(const struct sr_dev_inst *sdi,
                bs_offset += bs_part_size;
        }
 
-       ret = SR_OK;
-
        sr_info("Bitstream upload done.");
 
        /* Check a scratch register? */