X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fbeaglelogic_tcp.c;h=9cf78bbf854630d7b9f9431fd269a81fddb04ed7;hb=59d916fe6789909cd9fa4ea636ea994eb0c4b404;hp=24355240ceb89569ddd2749e55110c5da77aa4c7;hpb=71f2000bfb01f69638883b1ec5540d82b11099e6;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/beaglelogic_tcp.c b/src/hardware/beaglelogic/beaglelogic_tcp.c
index 24355240..9cf78bbf 100644
--- a/src/hardware/beaglelogic/beaglelogic_tcp.c
+++ b/src/hardware/beaglelogic/beaglelogic_tcp.c
@@ -112,7 +112,7 @@ static int beaglelogic_tcp_send_cmd(struct dev_context *devc,
 	}
 
 	if (out < (int)strlen(buf)) {
-		sr_dbg("Only sent %d/%lu bytes of command: '%s'.", out,
+		sr_dbg("Only sent %d/%zu bytes of command: '%s'.", out,
 		       strlen(buf), buf);
 	}
 
@@ -172,6 +172,7 @@ static int beaglelogic_tcp_get_string(struct dev_context *devc, const char *cmd,
 	int len;
 	gint64 timeout;
 
+	*tcp_resp = NULL;
 	if (cmd) {
 		if (beaglelogic_tcp_send_cmd(devc, cmd) != SR_OK)
 			return SR_ERR;
@@ -288,9 +289,11 @@ static int beaglelogic_get_samplerate(struct dev_context *devc)
 	int arg, err;
 
 	err = beaglelogic_tcp_get_int(devc, "samplerate", &arg);
-	devc->cur_samplerate = arg;
+	if (err)
+		return err;
 
-	return err;
+	devc->cur_samplerate = arg;
+	return SR_OK;
 }
 
 static int beaglelogic_set_samplerate(struct dev_context *devc)