From: Uwe Hermann <redacted>
Date: Sun, 13 Sep 2015 20:44:40 +0000 (+0200)
Subject: tondaj-sl-814: Fix blocking serial write timeout.
X-Git-Tag: libsigrok-0.4.0~297
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=32c45845f70c41137cbfa7e772bf79791e269895;p=libsigrok.git

tondaj-sl-814: Fix blocking serial write timeout.

This fixes bug #436.
---

diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index a3696b69..44d12ec4 100644
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -134,7 +134,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 		buf[2] = 0x0d;
 		sr_spew("Sending init command: %02x %02x %02x.",
 			buf[0], buf[1], buf[2]);
-		if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3,
+				serial_timeout(serial, 3))) < 0) {
 			sr_err("Error sending init command: %d.", ret);
 			return FALSE;
 		}
@@ -160,7 +161,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 		buf[2] = 0x0d;
 		sr_spew("Sending data request command: %02x %02x %02x.",
 			buf[0], buf[1], buf[2]);
-		if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3,
+				serial_timeout(serial, 3))) < 0) {
 			sr_err("Error sending request command: %d.", ret);
 			return FALSE;
 		}