X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Ffx2lafw%2Fdslogic.c;h=b1cbac096b5533f4031950ffd62a7005043b12d6;hb=7237e91262251a138cf150f9fcfe7b05d0e5904b;hp=6a8af1306b6b0151547865b465dfbb27d1b9b904;hpb=4df5739a9f4272e57d737dc3a957b2f723bbaad1;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/dslogic.c b/src/hardware/fx2lafw/dslogic.c
index 6a8af130..b1cbac09 100644
--- a/src/hardware/fx2lafw/dslogic.c
+++ b/src/hardware/fx2lafw/dslogic.c
@@ -43,26 +43,28 @@ int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 	int chunksize, result, ret;
 	unsigned char *buf;
 	int sum, transferred;
+	uint8_t cmd[3];
 
 	sr_dbg("Uploading FPGA firmware at %s.", filename);
 
 	usb = sdi->conn;
 	if (stat(filename, &st) < 0) {
-		sr_err("Unable to upload FPGA firmware: %s", strerror(errno));
+		sr_err("Unable to upload FPGA firmware: %s", g_strerror(errno));
 		return SR_ERR;
 	}
 
 	/* Tell the device firmware is coming. */
+	memset(cmd, 0, sizeof(cmd));
 	if ((ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
 			LIBUSB_ENDPOINT_OUT, DS_CMD_FPGA_FW, 0x0000, 0x0000,
-			NULL, 0, USB_TIMEOUT)) < 0) {
+			(unsigned char *)&cmd, sizeof(cmd), USB_TIMEOUT)) < 0) {
 		sr_err("Failed to upload FPGA firmware: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
 	buf = g_malloc(FW_BUFSIZE);
 
 	if (!(fw = g_fopen(filename, "rb"))) {
-		sr_err("Unable to open %s for reading: %s.", filename, strerror(errno));
+		sr_err("Unable to open %s for reading: %s.", filename, g_strerror(errno));
 		return SR_ERR;
 	}