sr: fx2lafw: Properly free transfer

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 2b8f1c34e25aafa3d8e483ee9b268d8dc841aa6a..d38a199923ed6f141f680798cd1369b18b513afc 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -682,6 +682,20 @@ static void finish_acquisition(struct context *ctx)
        free(lupfd); /* NOT g_free()! */
 }
 
+static void free_transfer(struct libusb_transfer *transfer)
+{
+       struct context *ctx = transfer->user_data;
+
+       g_free(transfer->buffer);
+       transfer->buffer = NULL;
+       libusb_free_transfer(transfer);
+
+       ctx->submitted_transfers--;
+       if (ctx->submitted_transfers == 0)
+               finish_acquisition(ctx);
+
+}
+
 static void receive_transfer(struct libusb_transfer *transfer)
 {
        /* TODO: These statics have to move to the ctx struct. */
@@ -697,13 +711,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
         * transfer that come in.
         */
        if (ctx->num_samples == -1) {
-               if (transfer)
-                       libusb_free_transfer(transfer);
-
-               ctx->submitted_transfers--;
-               if (ctx->submitted_transfers == 0)
-                       finish_acquisition(ctx);
-
+               free_transfer(transfer);
                return;
        }
 
@@ -718,7 +726,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        /* Fire off a new request. */
        if (!(new_buf = g_try_malloc(4096))) {
                sr_err("fx2lafw: %s: new_buf malloc failed.", __func__);
-               libusb_free_transfer(transfer);
+               free_transfer(transfer);
                return; /* TODO: SR_ERR_MALLOC */
        }
 
@@ -830,8 +838,8 @@ static void receive_transfer(struct libusb_transfer *transfer)
 static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
        struct sr_dev_inst *sdi;
-       struct sr_datafeed_packet *packet;
-       struct sr_datafeed_header *header;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_header header;
        struct sr_datafeed_meta_logic meta;
        struct context *ctx;
        struct libusb_transfer *transfer;
@@ -845,16 +853,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        ctx->session_dev_id = cb_data;
        ctx->num_samples = 0;
 
-       if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
-               sr_err("fx2lafw: %s: packet malloc failed.", __func__);
-               return SR_ERR_MALLOC;
-       }
-
-       if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) {
-               sr_err("fx2lafw: %s: header malloc failed.", __func__);
-               return SR_ERR_MALLOC;
-       }
-
        /* Start with 2K transfer, subsequently increased to 4K. */
        size = 2048;
        for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
@@ -883,21 +881,18 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
                              40, receive_data, NULL);
        free(lupfd); /* NOT g_free()! */
 
-       packet->type = SR_DF_HEADER;
-       packet->payload = header;
-       header->feed_version = 1;
-       gettimeofday(&header->starttime, NULL);
-       sr_session_send(cb_data, packet);
+       packet.type = SR_DF_HEADER;
+       packet.payload = &header;
+       header.feed_version = 1;
+       gettimeofday(&header.starttime, NULL);
+       sr_session_send(cb_data, &packet);
 
        /* Send metadata about the SR_DF_LOGIC packets to come. */
-       packet->type = SR_DF_META_LOGIC;
-       packet->payload = &meta;
+       packet.type = SR_DF_META_LOGIC;
+       packet.payload = &meta;
        meta.samplerate = ctx->cur_samplerate;
        meta.num_probes = ctx->sample_wide ? 16 : 8;
-       sr_session_send(cb_data, packet);
-
-       g_free(header);
-       g_free(packet);
+       sr_session_send(cb_data, &packet);
 
        if ((ret = command_start_acquisition (ctx->usb->devhdl,
                ctx->cur_samplerate, ctx->sample_wide)) != SR_OK) {