pce-322a: Pass driver dev_close callback std_serial_dev_acquisition_stop()

[libsigrok.git] / src / hardware / atten-pps3xxx / api.c

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 3b9f11333e55b086003db45b568a928ab6877f8e..b1724550e1d9012f3b03d53cd8f954a4623ba093 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -78,13 +78,12 @@ static const struct pps_model models[] = {
 static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 {
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
        struct sr_channel *ch;
        struct sr_channel_group *cg;
        struct sr_serial_dev_inst *serial;
-       GSList *l, *devices;
+       GSList *l;
        const struct pps_model *model;
        uint8_t packet[PACKET_SIZE];
        unsigned int i;
@@ -92,9 +91,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
        const char *conn, *serialcomm;
        char channel[10];
 
-       devices = NULL;
-       drvc = di->context;
-
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -175,13 +171,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
        devc->config = g_malloc0(sizeof(struct per_channel_config) * model->num_channels);
        devc->delay_ms = delay_ms;
        sdi->priv = devc;
-       devices = g_slist_append(devices, sdi);
 
        serial_close(serial);
-       if (!devices)
-               sr_serial_dev_inst_free(serial);
 
-       return std_scan_complete(di, devices);
+       return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static GSList *scan_3203(struct sr_dev_driver *di, GSList *options)