X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=std.c;h=fe0893461ef2fe990c4556d3e4092a2969dd493a;hb=3a277f3b2b01da3d7d1e26ddbb30471db68fc11c;hp=8add0d3dc622c2045cfa5c870efb4ab39183dde7;hpb=c2fa697afa86a8e6f37bef13acb5b8532714274e;p=libsigrok.git

diff --git a/std.c b/std.c
index 8add0d3d..fe089346 100644
--- a/std.c
+++ b/std.c
@@ -184,7 +184,10 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
 	GSList *l;
 	int ret;
 
-	drvc = driver->priv;
+	if (!(drvc = driver->priv))
+		/* Driver was never initialized, nothing to do. */
+		return SR_OK;
+
 	ret = SR_OK;
 	for (l = drvc->instances; l; l = l->next) {
 		/* Log errors, but continue cleaning up the rest. */