From: Uwe Hermann <redacted>
Date: Fri, 15 Nov 2013 11:23:09 +0000 (+0100)
Subject: serial.c: Temporary quickfix until a libserialport fix is done.
X-Git-Tag: libsigrok-0.3.0~556
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=449cc16bb279e5d3322846ce6bd390e867e71ccb;p=libsigrok.git

serial.c: Temporary quickfix until a libserialport fix is done.
---

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 3d301be2..7dde05e0 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -244,11 +244,12 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
 	case SP_ERR_ARG:
 		sr_err("Attempted serial port read with invalid arguments.");
 		return SR_ERR_ARG;
-	case SP_ERR_FAIL:
-		error = sp_last_error_message();
-		sr_err("Read error: %s.", error);
-		sp_free_error_message(error);
-		return SR_ERR;
+	// Temporarily disabled, will come back later.
+	// case SP_ERR_FAIL:
+	// 	error = sp_last_error_message();
+	// 	sr_err("Read error: %s.", error);
+	// 	sp_free_error_message(error);
+	// 	return SR_ERR;
 	}
 
 	sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);