Some more g_try_*alloc() fixes.

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

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 3213a684a95ffbc275d601467111398b32f53700..14273ce3d4fcfcb32fc7b391ef060ec0b0acb4e0 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -215,18 +215,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        ret = SR_OK;
        switch (key) {
        case SR_CONF_DATALOG:
-               if (g_variant_get_boolean(data)) {
-                       /* Start logging. */
+               if (g_variant_get_boolean(data))
                        ret = lascar_start_logging(sdi);
-               } else {
-                       /* Stop logging. */
+               else
                        ret = lascar_stop_logging(sdi);
-               }
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
                break;
        default:
                ret = SR_ERR_NA;
@@ -305,11 +300,11 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi)
                devc->temp_unit = devc->config[0x2e] | (devc->config[0x2f] << 8);
                if (devc->temp_unit != 0 && devc->temp_unit != 1) {
                        sr_dbg("invalid temperature unit %d", devc->temp_unit);
-                       /* Default to Celcius, we're all adults here. */
+                       /* Default to Celsius, we're all adults here. */
                        devc->temp_unit = 0;
                } else
                        sr_dbg("temperature unit is %s", devc->temp_unit
-                                       ? "Fahrenheit" : "Celcius");
+                                       ? "Fahrenheit" : "Celsius");
                break;
        case LOG_CO:
                devc->sample_size = 2;
@@ -395,7 +390,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                ;
 
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
-                       resp, sizeof(resp), mark_xfer, 0, 10000);
+                       resp, sizeof(resp), mark_xfer, 0, BULK_XFER_TIMEOUT);
        if (libusb_submit_transfer(xfer_in) != 0) {
                libusb_free_transfer(xfer_in);
                libusb_free_transfer(xfer_out);
@@ -416,7 +411,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        tv.tv_sec = 0;
        tv.tv_usec = 0;
        while (!xfer_in->user_data || !xfer_out->user_data) {
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
        if (xfer_in->user_data != GINT_TO_POINTER(1) ||
@@ -438,7 +433,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        usb_source_add(sdi->session, drvc->sr_ctx, 100,
                        lascar_el_usb_handle_events, (void *)sdi);
 
-       buf = g_try_malloc(4096);
+       buf = g_malloc(4096);
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
                        buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
        if ((ret = libusb_submit_transfer(xfer_in) != 0)) {