X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fserial.c;h=25e2b97b3ce63ef30e04317e50c9e3b7303462f2;hb=4399cc0f41077cd975601a095fd272a2bf27bb99;hp=6d33b3bf9f9e543dbed815cccae6a5ad8ec77b1d;hpb=f3f19d1131025b68d29a11273b627c83d748e7ea;p=libsigrok.git

diff --git a/src/serial.c b/src/serial.c
index 6d33b3bf..25e2b97b 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -693,7 +693,7 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
 	}
 
 	/* Assume 8n1 transmission. That is 10 bits for every byte. */
-	byte_delay_us = 10 * (1000000 / baudrate);
+	byte_delay_us = 10 * ((1000 * 1000) / baudrate);
 	start = g_get_monotonic_time();
 
 	i = ibuf = len = 0;
@@ -843,6 +843,9 @@ SR_PRIV int serial_source_remove(struct sr_session *session,
 {
 	unsigned int i;
 
+	if (!serial->event_set)
+		return SR_OK;
+
 	for (i = 0; i < serial->event_set->count; i++)
 		if (sr_session_source_remove_pollfd(session, &serial->pollfds[i]) != SR_OK)
 			return SR_ERR;