X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=source%2Fdrv-api.c;h=fee866e9840ecf6e91eb91f55dbcd41f2d84a01d;hb=0832e7d675a9ea308ddcafbb2a1ed425c720fa1e;hp=dbeea02fc826207e771ed104d85f84228202362c;hpb=2ef7b331cd4468e128c823cc7a055bdef97ee33b;p=sigrok-util.git

diff --git a/source/drv-api.c b/source/drv-api.c
index dbeea02..fee866e 100644
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -33,7 +33,9 @@ static int clear_instances(void)
 	struct dev_context *devc;
 	GSList *l;
 
-	drvc = di->priv;
+	if (!(drvc = di->priv))
+		return SR_OK;
+
 	for (l = drvc->instances; l; l = l->next) {
 		if (!(sdi = l->data))
 			continue;
@@ -51,17 +53,18 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
 	struct drv_context *drvc;
 
 	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
 		sr_err("Driver context malloc failed.");
-		return SR_ERR;
+		return SR_ERR_MALLOC;
 	}
 
 	/* TODO */
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -157,8 +160,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-				   void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	(void)cb_data;