X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Ffluke.c;h=078ada1d8c1b54b53b116fceb3e3ff9d4febc2fd;hb=58d03f034f0d85a2840ed0bc9ea66506b5a1fa1b;hp=33f7bb651e5c1e7668cd65fe4b11361efb75c00a;hpb=530f201eb8280b343529747107c15e91c2ab0623;p=libsigrok.git

diff --git a/hardware/fluke-dmm/fluke.c b/hardware/fluke-dmm/fluke.c
index 33f7bb65..078ada1d 100644
--- a/hardware/fluke-dmm/fluke.c
+++ b/hardware/fluke-dmm/fluke.c
@@ -314,6 +314,8 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	int len;
 	int64_t now, elapsed;
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -323,7 +325,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
 		while(FLUKEDMM_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++;
@@ -349,7 +351,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
 	if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
 			|| elapsed > 1000) {
 		sr_spew("Sending QM.");
-		if (serial_write(devc->serial->fd, "QM\r", 3) == -1)
+		if (serial_write(devc->serial, "QM\r", 3) == -1)
 			sr_err("Unable to send QM: %s.", strerror(errno));
 		devc->cmd_sent_at = now;
 		devc->expect_response = TRUE;