From: Uwe Hermann <redacted>
Date: Sun, 13 Sep 2015 21:55:22 +0000 (+0200)
Subject: conrad-digi-35-cpu: Fix blocking serial write timeout.
X-Git-Tag: libsigrok-0.4.0~292
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8b9eb639b2e12ab2f9d710af7342f26283747904;p=libsigrok.git

conrad-digi-35-cpu: Fix blocking serial write timeout.

This fixes bug #430.
---

diff --git a/src/hardware/conrad-digi-35-cpu/protocol.c b/src/hardware/conrad-digi-35-cpu/protocol.c
index 32702d83..732bec62 100644
--- a/src/hardware/conrad-digi-35-cpu/protocol.c
+++ b/src/hardware/conrad-digi-35-cpu/protocol.c
@@ -49,7 +49,8 @@ SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param)
 
 	sr_spew("send_msg1(): %c%c%c%c\\r", buf[0], buf[1], buf[2], buf[3]);
 
-	if (serial_write_blocking(serial, buf, sizeof(buf), 0) < (int)sizeof(buf)) {
+	if (serial_write_blocking(serial, buf, sizeof(buf),
+			serial_timeout(serial, sizeof(buf))) < (int)sizeof(buf)) {
 		sr_err("Write error for cmd=%c", cmd);
 		return SR_ERR;
 	}