X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fprotocol.c;h=1b75bef7aa906142fdc684e2a4f361c4e38b02cd;hb=06c45a66f76f986cd845a05fdee36956b1339621;hp=5f1d5a2eafeda4a99b045b7d719c9a1e55996c51;hpb=1d166757694b259bbcca205ced91ac69e8a5ef7e;p=libsigrok.git

diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c
index 5f1d5a2e..1b75bef7 100644
--- a/hardware/lascar-el-usb/protocol.c
+++ b/hardware/lascar-el-usb/protocol.c
@@ -595,10 +595,13 @@ static int set_flags(unsigned char *configblock, int flags)
 SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	struct sr_usb_dev_inst *usb;
 	int dummy, flags, ret;
 
 	devc = sdi->priv;
-	if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK)
+	usb = sdi->conn;
+
+	if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK)
 		return -1;
 
 	flags = get_flags(devc->config);
@@ -613,10 +616,13 @@ SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
 SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	struct sr_usb_dev_inst *usb;
 	int len, flags, ret;
 
 	devc = sdi->priv;
-	if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+	usb = sdi->conn;
+
+	if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
 		return SR_ERR;
 
 	/* Turn on logging. */
@@ -627,7 +633,7 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
 	/* Start logging in 0 seconds. */
 	memset(devc->config + 24, 0, 4);
 
-	ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+	ret = lascar_save_config(usb->devhdl, devc->config, len);
 	sr_info("Started internal logging.");
 
 	return ret;
@@ -636,17 +642,20 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
 SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
+	struct sr_usb_dev_inst *usb;
 	int len, flags, ret;
 
 	devc = sdi->priv;
-	if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+	usb = sdi->conn;
+
+	if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
 		return SR_ERR;
 
 	flags = get_flags(devc->config);
 	flags &= ~0x0100;
 	set_flags(devc->config, flags);
 
-	ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+	ret = lascar_save_config(usb->devhdl, devc->config, len);
 	sr_info("Stopped internal logging.");
 
 	return ret;