std: Add and use std_dev_clear() where possible.

[libsigrok.git] / src / hardware / asix-sigma / api.c

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 50a1d489ed51fa22d03a9778f1426afed2ce0b34..542aadbb16c7df56a4a782ab793a5ebe0eb8a9ca 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -61,7 +61,7 @@ static const int32_t trigger_matches[] = {
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, sigma_clear_helper);
+       return std_dev_clear_with_callback(di, sigma_clear_helper);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -156,11 +156,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       ftdi_usb_close(&devc->ftdic);
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
+       return (ftdi_usb_close(&devc->ftdic) == 0) ? SR_OK : SR_ERR;
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,