soft-trigger: Add support for pre-triggering.

[libsigrok.git] / src / hardware / tondaj-sl-814 / api.c

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 69aa30e90eb6e2bbcc0f8d65d36d5894a20efffe..2ea66ebf59be08f444e1d3469ca49b927c3201ee 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -88,14 +88,9 @@ static GSList *scan(GSList *options)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Tondaj");
        sdi->model = g_strdup("SL-814");
+       devc = g_malloc0(sizeof(struct dev_context));
 
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               return NULL;
-       }
-
-       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;
@@ -106,10 +101,6 @@ static GSList *scan(GSList *options)
        sdi->priv = devc;
        sdi->driver = di;
        ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
-       if (!ch) {
-               sr_err("Failed to create channel.");
-               return NULL;
-       }
        sdi->channels = g_slist_append(sdi->channels, ch);
        drvc->instances = g_slist_append(drvc->instances, sdi);
        devices = g_slist_append(devices, sdi);