X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fgnuplot.c;h=9e1f2af6c3e4e081278c828e6a6099e85557472a;hb=af51a7718eb22e9630107af814db6ae9f179a969;hp=7c033a91c3136f9016c7355605b5c129121c6a1d;hpb=0a7da5f8c9f1c6656672152ad48d76b5a4cd7ecd;p=libsigrok.git

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 7c033a91..9e1f2af6 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -78,11 +78,6 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->sdi->driver) {
-		sr_err("%s: o->sdi->driver was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
 	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
 		sr_err("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
@@ -100,19 +95,18 @@ static int init(struct sr_output *o)
 	num_probes = g_slist_length(o->sdi->probes);
 	comment[0] = '\0';
 	samplerate = 0;
-	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) {
 		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 		if (!(frequency_s = sr_samplerate_string(samplerate))) {
 			sr_err("%s: sr_samplerate_string failed", __func__);
 			g_free(ctx);
-			g_variant_unref(gvar);
 			return SR_ERR;
 		}
 		snprintf(comment, 127, gnuplot_header_comment,
 			ctx->num_enabled_probes, num_probes, frequency_s);
 		g_free(frequency_s);
-		g_variant_unref(gvar);
 	}
 
 	/* Columns / channels */