X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=15dda4e09d72a96b91510881a10ebb978c1255c6;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=a4e62619600bca84ba82924612a6119e436c1b5b;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index a4e62619..15dda4e0 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -171,9 +171,8 @@ static int dev_open(struct sr_dev_inst *sdi)
 		sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
-	sdi->status = SR_ST_ACTIVE;
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -184,8 +183,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
-		/*  Nothing to do. */
-		return SR_OK;
+		return SR_ERR_BUG;
 
 	/* This allows a frontend to configure the device without ever
 	 * doing an acquisition step. */
@@ -196,7 +194,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 	libusb_release_interface(usb->devhdl, USB_INTERFACE);
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -261,9 +258,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	ret = SR_OK;
 	switch (key) {
@@ -380,9 +374,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	int req_len, buf_len, len, ret;
 	unsigned char buf[9];
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	drvc = di->context;
 	devc = sdi->priv;
 	usb = sdi->conn;
@@ -478,9 +469,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	/* Signal USB transfer handler to clean up and stop. */
 	sdi->status = SR_ST_STOPPING;
 
@@ -506,7 +494,7 @@ static struct sr_dev_driver kecheng_kc_330b_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
-	.dev_clear = NULL,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,