X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fsched.c;h=67c2a1b66330d01f29a7edc2c927ff192065216e;hb=1987b8d63e748f0813dc6a4630e99686e4fe1728;hp=56e768dbc0ebfac1270c38b4647a755228794815;hpb=74ac7d7f735011012fb942577e38ddfe64738c8d;p=libsigrok.git

diff --git a/hardware/agilent-dmm/sched.c b/hardware/agilent-dmm/sched.c
index 56e768db..67c2a1b6 100644
--- a/hardware/agilent-dmm/sched.c
+++ b/hardware/agilent-dmm/sched.c
@@ -93,6 +93,8 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	int len;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -102,7 +104,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
 		while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
-			len = serial_read(fd, devc->buf + devc->buflen, 1);
+			len = serial_read(devc->serial, devc->buf + devc->buflen, 1);
 			if (len < 1)
 				break;
 			devc->buflen += len;
@@ -117,7 +119,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
 
 	dispatch(sdi);
 
-	if (devc->num_samples >= devc->limit_samples)
+	if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
 		sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
 	return TRUE;
@@ -135,7 +137,7 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd)
 		strncat(buf, "\r\n", 32);
 	else
 		strncat(buf, "\n\r\n", 32);
-	if (serial_write(devc->serial->fd, buf, strlen(buf)) == -1) {
+	if (serial_write(devc->serial, buf, strlen(buf)) == -1) {
 		sr_err("Failed to send: %s.", strerror(errno));
 		return SR_ERR;
 	}