X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Ftesto%2Fprotocol.c;h=89f5bc9c2ff063383acb5c4f91285ae01d2f8a5e;hb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;hp=be36023f7bd56849b74e3b960cd78ba60a878af1;hpb=2c24077466a299ead689c90f01f55f6d86c7386b;p=libsigrok.git

diff --git a/src/hardware/testo/protocol.c b/src/hardware/testo/protocol.c
index be36023f..89f5bc9c 100644
--- a/src/hardware/testo/protocol.c
+++ b/src/hardware/testo/protocol.c
@@ -25,25 +25,25 @@ SR_PRIV int testo_set_serial_params(struct sr_usb_dev_inst *usb)
 {
 	int ret;
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_BAUDRATE,
+	if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_BAUDRATE,
 			FTDI_BAUDRATE_115200, FTDI_INDEX, NULL, 0, 10)) < 0) {
 			sr_err("Failed to set baudrate: %s", libusb_error_name(ret));
 			return SR_ERR;
 	}
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_PARAMS,
+	if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_PARAMS,
 			FTDI_PARAMS_8N1, FTDI_INDEX, NULL, 0, 10)) < 0) {
 			sr_err("Failed to set comm parameters: %s", libusb_error_name(ret));
 			return SR_ERR;
 	}
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_FLOWCTRL,
+	if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_FLOWCTRL,
 			FTDI_FLOW_NONE, FTDI_INDEX, NULL, 0, 10)) < 0) {
 			sr_err("Failed to set flow control: %s", libusb_error_name(ret));
 			return SR_ERR;
 	}
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_MODEMCTRL,
+	if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_MODEMCTRL,
 			FTDI_MODEM_ALLHIGH, FTDI_INDEX, NULL, 0, 10)) < 0) {
 			sr_err("Failed to set modem control: %s", libusb_error_name(ret));
 			return SR_ERR;
@@ -158,8 +158,7 @@ SR_PRIV int testo_request_packet(const struct sr_dev_inst *sdi)
 			receive_transfer, (void *)sdi, 100);
 	if ((ret = libusb_submit_transfer(devc->out_transfer) != 0)) {
 		sr_err("Failed to request packet: %s.", libusb_error_name(ret));
-		sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-				devc->cb_data);
+		sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
 		return SR_ERR;
 	}
 	sr_dbg("Requested new packet.");