manson-hcs-3xxx: Fix incorrect SR_CONF_SCAN_OPTIONS handling.

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 9287509f8e3c1088f4d0376524e0e1df2dc5f00b..acbfcda0289606b66be4086ae0ef8c62fc7a6215 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -100,10 +100,7 @@ static GSList *scan(GSList *options)
        devices = NULL;
 
        /* Allocate memory for our private device context. */
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               goto err_free_nothing;
-       }
+       devc = g_malloc0(sizeof(struct dev_context));
 
        /* Device-specific settings */
        devc->max_samplebytes = devc->max_samplerate = devc->protocol_version = 0;
@@ -185,7 +182,6 @@ static GSList *scan(GSList *options)
 
        /* Parse the metadata. */
        sdi = p_ols_get_metadata((uint8_t *)buf, bytes_read, devc);
-       sdi->index = 0;
 
        /* Configure samplerate and divider. */
        if (p_ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK)
@@ -205,7 +201,6 @@ err_free_ftdi_buf:
        g_free(devc->ftdi_buf);
 err_free_devc:
        g_free(devc);
-err_free_nothing:
 
        return NULL;
 }