clear_helper(): Use a cast to shorten all implementations.

[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..98d5180bd2de156a302d26864bd526e64fa5b6e2 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -59,9 +59,14 @@ static const int32_t trigger_matches[] = {
 };
 #endif
 
+static void clear_helper(struct dev_context *devc)
+{
+       ftdi_deinit(&devc->ftdic);
+}
+
 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, (std_dev_clear_callback)clear_helper);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -156,11 +161,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,