X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fapi.c;h=4440be67f52695fd4613dac506381a93c253efae;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=5995cdf87f69cb21ccd1f81a56883f64f15bf2f0;hpb=6402c379161ec138e451901c411817a55846a75b;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 5995cdf8..4440be67 100644
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -201,7 +201,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-	return std_dev_clear(di, clear_helper);
+	return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -411,12 +411,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	if (p_ols_open(devc) != SR_OK)
-		return SR_ERR;
-
-	sdi->status = SR_ST_ACTIVE;
-
-	return SR_OK;
+	return p_ols_open(devc);
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -425,8 +420,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	sdi->status = SR_ST_INACTIVE;
-
 	return p_ols_close(devc);
 }