From: Martin Ling <redacted>
Date: Tue, 16 Sep 2014 01:01:27 +0000 (+0100)
Subject: serial-dmm: Remove SERIAL_NONBLOCK flag.
X-Git-Tag: libsigrok-0.4.0~981
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=2e360339f9ead64ced1747e3ce49863b18db22ee;ds=sidebyside

serial-dmm: Remove SERIAL_NONBLOCK flag.

All serial read/write calls in this driver are now explicitly
nonblocking so there is no need for this flag.
---

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index f423f474..47811001 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -353,7 +353,7 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
 	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;
 
 	sr_info("Probing serial port %s.", conn);