X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fprotocol.c;h=c74187ada435f2441e7aa3b88ed926194c9d530b;hb=aa29b255f8f507e6d842ab0c54f23d8adcd65bc1;hp=55a8f71adc7747b44e3a5c2ce838a33de8634663;hpb=be702d16d0e37602a312b00d06f6c4e2c3a7e55a;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/protocol.c b/src/hardware/hantek-dso/protocol.c
index 55a8f71a..c74187ad 100644
--- a/src/hardware/hantek-dso/protocol.c
+++ b/src/hardware/hantek-dso/protocol.c
@@ -130,7 +130,9 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 			/*
 			 * Check device by its physical USB bus/port address.
 			 */
-			usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+			if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+				continue;
+
 			if (strcmp(sdi->connection_id, connection_id))
 				/* This is not the one. */
 				continue;
@@ -373,7 +375,7 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi)
 	memset(cmdstring, 0, sizeof(cmdstring));
 	cmdstring[0] = CMD_2250_SET_TRIGGERPOS_AND_BUFFER;
 
-	sr_dbg("Capture ratio: %d.", devc->capture_ratio);
+	sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio);
 	trig = devc->capture_ratio;
 	dso2250_set_triggerpos(trig,
 			devc->framesize != FRAMESIZE_SMALL, cmdstring, 2);
@@ -494,7 +496,7 @@ SR_PRIV int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
 	cmdstring[5] = (tmp >> 8) & 0xff;
 
 	/* Horizontal trigger position */
-	sr_dbg("Capture ratio: %d.", devc->capture_ratio);
+	sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio);
 	tmp = 0x77fff + 0x8000 * devc->capture_ratio / 100;
 	cmdstring[6] = tmp & 0xff;
 	cmdstring[7] = (tmp >> 8) & 0xff;