X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=3a987c626928c1a62b1953077713383fa18b5bf0;hb=d05b1a860606e078eed77722d8a0c62850ee39af;hp=9412ff46e8ac8a09c469386ade2e7a4a236d23af;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index 9412ff46..3a987c62 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -535,7 +535,7 @@ static void parse_measurement(const uint8_t *pkt, float *floatval,
 			analog->meaning->mqflags |= SR_MQFLAG_RELATIVE;
 	}
 
-	if ((analog->meaning->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) < 0)
+	if ((analog->meaning->mq = parse_mq(pkt, is_secondary, pkt[2] & 0x80)) == 0)
 		return;
 
 	if ((buf[3] >> 3) >= ARRAY_SIZE(units)) {
@@ -741,14 +741,11 @@ static const char *const channel_names[] = { "P1", "P2" };
 static int setup_channels(struct sr_dev_inst *sdi)
 {
 	unsigned int i;
-	int ret;
-
-	ret = SR_ERR_BUG;
 
 	for (i = 0; i < ARRAY_SIZE(channel_names); i++)
 		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 
-	return ret;
+	return SR_OK;
 }
 
 SR_PRIV void es51919_serial_clean(void *priv)
@@ -802,10 +799,8 @@ SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,
 
 scan_cleanup:
 	es51919_serial_clean(devc);
-	if (sdi)
-		sr_dev_inst_free(sdi);
-	if (serial)
-		sr_serial_dev_inst_free(serial);
+	sr_dev_inst_free(sdi);
+	sr_serial_dev_inst_free(serial);
 
 	return NULL;
 }