X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fvcd.c;h=d89284927602a55d7a3e87beb5753b0d02e0cf07;hb=c2fa697afa86a8e6f37bef13acb5b8532714274e;hp=6e13d7046b17655c4db9251a5a15cb3e5f64a574;hpb=17f63de642c3cb613f91eabd2e19ebed6785f755;p=libsigrok.git

diff --git a/output/vcd.c b/output/vcd.c
index 6e13d704..d8928492 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -95,19 +95,18 @@ static int init(struct sr_output *o)
 	g_string_append_printf(ctx->header, "$version %s %s $end\n",
 			PACKAGE, PACKAGE_VERSION);
 
-	if (o->sdi->driver && 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);
 		if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
 			g_string_free(ctx->header, TRUE);
 			g_free(ctx);
-			g_variant_unref(gvar);
 			return SR_ERR;
 		}
 		g_string_append_printf(ctx->header, vcd_header_comment,
 				 ctx->num_enabled_probes, num_probes, samplerate_s);
 		g_free(samplerate_s);
-		g_variant_unref(gvar);
 	}
 
 	/* timescale */