From: Uwe Hermann <redacted>
Date: Thu, 27 Nov 2014 22:22:05 +0000 (+0100)
Subject: saleae-logic16: Change two errors into warnings.
X-Git-Tag: libsigrok-0.4.0~704
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=a11e10ec91d596a8d882dffe28b2abea65855ffb;p=libsigrok.git

saleae-logic16: Change two errors into warnings.

Related to #466, convert two more sanity checks from errors into warnings.
This may allow more devices to work with libsigrok.
---

diff --git a/src/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c
index d60bf3e7..839397f8 100644
--- a/src/hardware/saleae-logic16/protocol.c
+++ b/src/hardware/saleae-logic16/protocol.c
@@ -470,8 +470,8 @@ SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,
 	reg1 &= ~0x20;
 
 	if (devc->fpga_variant == FPGA_VARIANT_ORIGINAL && reg1 != 0x08) {
-		sr_dbg("Invalid state at acquisition setup register 1: 0x%02x != 0x08.", reg1);
-		return SR_ERR;
+		sr_dbg("Invalid state at acquisition setup register 1: 0x%02x != 0x08. "
+		       "Proceeding anyway.", reg1);
 	}
 
 	if ((ret = write_fpga_register(sdi, 1, 0x40)) != SR_OK)
@@ -507,9 +507,8 @@ SR_PRIV int logic16_setup_acquisition(const struct sr_dev_inst *sdi,
 		return ret;
 
 	if (devc->fpga_variant == FPGA_VARIANT_ORIGINAL && reg10 != clock_select) {
-		sr_dbg("Invalid state at acquisition setup register 10: 0x%02x != 0x%02x.",
-		       reg10, clock_select);
-		return SR_ERR;
+		sr_dbg("Invalid state at acquisition setup register 10: 0x%02x != 0x%02x. "
+		       "Proceeding anyway.", reg10, clock_select);
 	}
 
 	return SR_OK;