X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=332c90172db349ad1a6e3ebd8778e35063f1a86f;hb=91057d2fc24c0ca058aa08c8ea6ada4eadf05ffd;hp=303d435baffdea1e6b21554276a7742b41349d87;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 303d435b..332c9017 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -159,8 +159,6 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
 	conn = serialcomm = NULL;
 	serialcomm_given = FALSE;
 
-	sr_spew("scan_1x_2x_rs232() called!");
-
 	for (l = options; l; l = l->next) {
 		src = l->data;
 		switch (src->key) {
@@ -242,8 +240,6 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 	conn = serialcomm = NULL;
 	devices = NULL;
 
-	sr_spew("scan_2x_bd232() called!");
-
 	for (l = options; l; l = l->next) {
 		src = l->data;
 		switch (src->key) {
@@ -321,13 +317,9 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 	return std_scan_complete(di, devices);
 
 exit_err:
-	sr_info("scan_2x_bd232(): Error!");
-
-	if (serial)
-		sr_serial_dev_inst_free(serial);
+	sr_serial_dev_inst_free(serial);
 	g_free(devc);
-	if (sdi)
-		sr_dev_inst_free(sdi);
+	sr_dev_inst_free(sdi);
 
 	return NULL;
 }
@@ -336,13 +328,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	std_serial_dev_close(sdi);
+	devc = sdi->priv;
 
-	sdi->status = SR_ST_INACTIVE;
-	if ((devc = sdi->priv))
-		devc->model = METRAHIT_NONE;
+	devc->model = METRAHIT_NONE;
 
-	return SR_OK;
+	return std_serial_dev_close(sdi);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -429,9 +419,6 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
@@ -452,9 +439,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;