X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fapi.c;h=00d058aa26f87d16f0c7360f5841b26bfac93bfe;hb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;hp=3e6a4d4521fff4e9656e5cd1128a0bf0ab3cd408;hpb=0af636bed97c174bea46e61e961eaa1b0b162e0f;p=libsigrok.git diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c index 3e6a4d45..00d058aa 100644 --- a/src/hardware/teleinfo/api.c +++ b/src/hardware/teleinfo/api.c @@ -92,18 +92,12 @@ static GSList *scan(GSList *options) sr_info("Found device on port %s.", conn); - sdi = sr_dev_inst_new(); + sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("EDF"); sdi->model = g_strdup("Teleinfo"); - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - goto scan_cleanup; - } - + 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;