X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=f7d9d23fe2254069c31236cdf29ed27dae6a4357;hb=0ad7074c9e15ce1ef0a6027cc1e3eab1cc813316;hp=892a4828bb5d0e761170e486ac5e19b82d5d2d08;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 892a4828..f7d9d23f 100644
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -59,10 +59,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	}
 
 	devices = NULL;
-	if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
-		g_slist_free_full(usb_devices, g_free);
+	if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn)))
 		return NULL;
-	}
 
 	for (l = usb_devices; l; l = l->next) {
 		usb = l->data;
@@ -74,7 +72,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		devc = g_malloc0(sizeof(struct dev_context));
 		sdi->priv = devc;
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2");
+		sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "P2");
 
 		sdi->inst_type = SR_INST_USB;
 		sdi->conn = usb;
@@ -129,6 +127,9 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 	devc = sdi->priv;
 
+	if (!usb->devhdl)
+		return SR_OK;
+
 	if ((ret = libusb_release_interface(usb->devhdl, 0)))
 		sr_err("Failed to release interface 0: %s.\n", libusb_error_name(ret));