lascar-el-usb: Fix copy-paste errors.

[libsigrok.git] / src / hardware / lascar-el-usb / protocol.c

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index cc40bbfab7e98dd9aad4b2b59c2c444b15249e94..1437773c502cfbbc30ddd9e1c8becec4f5d25981 100644 (file)
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,12 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -96,7 +97,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
 
        sr_spew("Reading config block.");
 
-       drvc = di->priv;
+       drvc = di->context;
        *configlen = 0;
 
        if (!(xfer_in = libusb_alloc_transfer(0)) ||
@@ -182,7 +183,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
        *configlen = buflen;
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
@@ -213,7 +214,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
 
        sr_spew("Writing config block.");
 
-       drvc = di->priv;
+       drvc = di->context;
 
        if (!(xfer_in = libusb_alloc_transfer(0)) ||
                        !(xfer_out = libusb_alloc_transfer(0)))
@@ -268,7 +269,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
        }
 
 cleanup:
-       if (!xfer_in->user_data || !xfer_in->user_data) {
+       if (!xfer_in->user_data || !xfer_out->user_data) {
                if (!xfer_in->user_data)
                        libusb_cancel_transfer(xfer_in);
                if (!xfer_out->user_data)
@@ -356,7 +357,7 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
        int dummy, ret, i;
        unsigned char config[MAX_CONFIGBLOCK_SIZE];
 
-       drvc = di->priv;
+       drvc = di->context;
        sdi = NULL;
 
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
@@ -436,6 +437,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                                analog.unit = SR_UNIT_CELSIUS;
                        analog.data = temp;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                ch = sdi->channels->next->data;
@@ -445,6 +447,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                        analog.unit = SR_UNIT_PERCENTAGE;
                        analog.data = rh;
                        sr_session_send(devc->cb_data, &packet);
+                       g_slist_free(analog.channels);
                }
 
                g_free(temp);
@@ -479,7 +482,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 
 SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 {
-       struct drv_context *drvc = di->priv;
+       struct drv_context *drvc = di->context;
        struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
        struct timeval tv;