X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fchronovu_la8.c;h=a6184da2f00fd14087845fdb3a9128cf1bf60865;hb=c2fa697afa86a8e6f37bef13acb5b8532714274e;hp=3a8aee4591d85cd313c3c471f55c461500e6c023;hpb=91a44f50f0817b32c869f9623b86a6e698ba8e19;p=libsigrok.git

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 3a8aee45..a6184da2 100644
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -105,11 +105,6 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->sdi->driver) {
-		sr_warn("%s: o->sdi->driver was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
 	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
 		sr_warn("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
@@ -126,8 +121,8 @@ static int init(struct sr_output *o)
 	}
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-		o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+	if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+			o->sdi) == SR_OK) {
 		ctx->samplerate = g_variant_get_uint64(gvar);
 		g_variant_unref(gvar);
 	} else