Don't check sr_channel_new() return value (always succeeds).

[libsigrok.git] / src / hardware / asix-sigma / asix-sigma.c

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index cad6b989343c89106766def9fba8198e5eecf0ad..c577ca74686ca58268829c7c457efa35c339b08e 100644 (file)
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -341,10 +341,7 @@ static GSList *scan(GSList *options)
 
        devices = NULL;
 
-       if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
-               sr_err("%s: devc malloc failed", __func__);
-               return NULL;
-       }
+       devc = g_malloc0(sizeof(struct dev_context));
 
        ftdi_init(&devc->ftdic);
 
@@ -380,7 +377,7 @@ static GSList *scan(GSList *options)
        devc->use_triggers = 0;
 
        /* Register SIGMA device. */
-       sdi = sr_dev_inst_new();
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INITIALIZING;
        sdi->vendor = g_strdup(USB_VENDOR_NAME);
        sdi->model = g_strdup(USB_MODEL_NAME);
@@ -389,8 +386,6 @@ static GSList *scan(GSList *options)
        for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
                ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
                                    channel_names[i]);
-               if (!ch)
-                       return NULL;
                sdi->channels = g_slist_append(sdi->channels, ch);
        }