X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fasix-sigma.c;h=c577ca74686ca58268829c7c457efa35c339b08e;hb=988357ca2f0cb0d0e066111c12b9c0de74a53a1b;hp=53e35816374614babce2568978c7e844750b3303;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c index 53e35816..c577ca74 100644 --- 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); @@ -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); }