From: Martin Ling <redacted>
Date: Sun, 21 Sep 2014 17:05:56 +0000 (+0100)
Subject: conrad-digi-35-cpu: Remove SERIAL_NONBLOCK flag from open at scan time.
X-Git-Tag: libsigrok-0.4.0~964
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0ac161bba0d9caaafcc2df946eaf242379eb4bfd;p=libsigrok.git

conrad-digi-35-cpu: Remove SERIAL_NONBLOCK flag from open at scan time.

This open call is only made to check access, the port is closed immediately
afterwards. The flag therefore has no effect.
---

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index f0bb2366..95b22007 100644
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -86,7 +86,7 @@ static GSList *scan(GSList *options)
 	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
 	serial_flush(serial);