Consistently use g_malloc0() for allocating devc.

[libsigrok.git] / src / hardware / serial-dmm / api.c

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index bdcabef0355aba42baa4917e8ff478b7018f03cc..268805b04f7cef9f354f0e2d60d617b31090210e 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -82,7 +82,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut71e_ser_driver_info;
 SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
 SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
 SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
-SR_PRIV struct sr_dev_driver brymen_bm25x_ser_driver_info;
+SR_PRIV struct sr_dev_driver brymen_bm25x_driver_info;
 
 SR_PRIV struct dmm_info dmms[] = {
        {
@@ -379,11 +379,11 @@ SR_PRIV struct dmm_info dmms[] = {
                &tenma_72_7750_ser_driver_info, receive_data_TENMA_72_7750_SER,
        },
        {
-               "Brymen", "BM25x (BC20X cable)", "9600/8n1/rts=1/dtr=1",
+               "Brymen", "BM25x", "9600/8n1/rts=1/dtr=1",
                9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL,
                sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse,
                NULL,
-               &brymen_bm25x_ser_driver_info, receive_data_BRYMEN_BM25X_SER,
+               &brymen_bm25x_driver_info, receive_data_BRYMEN_BM25X,
        },
 };
 
@@ -456,18 +456,13 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
 
        sr_info("Found device on port %s.", conn);
 
-       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, dmms[dmm].vendor,
-                                   dmms[dmm].device, 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(dmms[dmm].vendor);
+       sdi->model = g_strdup(dmms[dmm].device);
+       devc = g_malloc0(sizeof(struct dev_context));
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
-
        sdi->priv = devc;
        sdi->driver = dmms[dmm].di;
        if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
@@ -703,4 +698,4 @@ DRV(uni_t_ut71e_ser, UNI_T_UT71E_SER, "uni-t-ut71e-ser", "UNI-T UT71E (UT-D02 ca
 DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N")
 DRV(tenma_72_7745_ser, TENMA_72_7745_SER, "tenma-72-7745-ser", "Tenma 72-7745 (UT-D02 cable)")
 DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)")
-DRV(brymen_bm25x_ser, BRYMEN_BM25X_SER, "brymen-bm25x-ser", "Brymen BM25x (BC20X cable)")
+DRV(brymen_bm25x, BRYMEN_BM25X, "brymen-bm25x", "Brymen BM25x")