X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Ftext.c;h=580942238aec1c62bef2bfd51072ff29ec4c56ff;hb=af51a7718eb22e9630107af814db6ae9f179a969;hp=4d231c90da4ab797e100a24469cab28ae345603f;hpb=0a7da5f8c9f1c6656672152ad48d76b5a4cd7ecd;p=libsigrok.git

diff --git a/output/text/text.c b/output/text/text.c
index 4d231c90..58094223 100644
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -129,14 +129,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 
 	snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
 	num_probes = g_slist_length(o->sdi->probes);
-	if (o->sdi->driver || sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-		if ((ret = o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar,
-				o->sdi)) != SR_OK)
-			goto err;
+	if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
+			o->sdi) == SR_OK) {
 		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 		if (!(samplerate_s = sr_samplerate_string(samplerate))) {
 			ret = SR_ERR;
-			g_variant_unref(gvar);
 			goto err;
 		}
 		snprintf(ctx->header + strlen(ctx->header),
@@ -144,7 +142,6 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 			 "Acquisition with %d/%d probes at %s\n",
 			 ctx->num_enabled_probes, num_probes, samplerate_s);
 		g_free(samplerate_s);
-		g_variant_unref(gvar);
 	}
 
 	ctx->linebuf_len = ctx->samples_per_line * 2 + 4;