X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=f94fc851c7dea68273dd2e212e3b0d47d30bed12;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=992cbd8124faf3561857019690d431b21e7ec6b5;hpb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 992cbd81..f94fc851 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,8 +317,6 @@ 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!");
-
 	sr_serial_dev_inst_free(serial);
 	g_free(devc);
 	sr_dev_inst_free(sdi);
@@ -334,12 +328,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	std_serial_dev_close(sdi);
+	devc = sdi->priv;
 
-	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,
@@ -470,7 +463,7 @@ static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan_1x_2x_rs232,
 	.dev_list = std_dev_list,
-	.dev_clear = NULL,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list_sm,
@@ -490,7 +483,7 @@ static struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan_2x_bd232,
 	.dev_list = std_dev_list,
-	.dev_clear = NULL,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list_bd,