Consistently use g_malloc0() for allocating devc.

[libsigrok.git] / src / hardware / teleinfo / api.c

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 77cd5f8d7e9c91386d59ff1fe4d7147b047eec9c..00d058aa26f87d16f0c7360f5841b26bfac93bfe 100644 (file)
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -92,16 +92,12 @@ static GSList *scan(GSList *options)
 
        sr_info("Found device on port %s.", conn);
 
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "EDF", "Teleinfo", NULL)))
-               goto scan_cleanup;
-
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               goto scan_cleanup;
-       }
-
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+       sdi->status = SR_ST_INACTIVE;
+       sdi->vendor = g_strdup("EDF");
+       sdi->model = g_strdup("Teleinfo");
+       devc = g_malloc0(sizeof(struct dev_context));
        devc->optarif = teleinfo_get_optarif(buf);
-
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;