X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-dmm%2Fapi.c;h=058835ee9ffb171eedafadc8f67ab9c5461d53c4;hb=16aca7661b7ab34a399c323bb9214721e2b1be0c;hp=0db5c2d83a7f8b9fba78eed01cab5eba673f6ccb;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c index 0db5c2d8..058835ee 100644 --- a/src/hardware/brymen-dmm/api.c +++ b/src/hardware/brymen-dmm/api.c @@ -44,15 +44,13 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) struct sr_dev_inst *sdi; struct dev_context *devc; struct drv_context *drvc; - struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; int ret; uint8_t buf[128]; size_t len; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) - return NULL; + serial = sr_serial_dev_inst_new(conn, serialcomm); if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; @@ -85,11 +83,7 @@ static GSList *brymen_scan(const char *conn, const char *serialcomm) drvc = di->priv; sdi->priv = devc; sdi->driver = di; - - if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) - goto scan_cleanup; - - sdi->channels = g_slist_append(sdi->channels, ch); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi);