X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=a6c45e3a02a0b6edc9f7c8446f10c73ba070cc70;hb=7c7a11204633e145178e4544b6418c59da33b2c7;hp=f0713010ea820ac60706f987ace12ec3545b81a4;hpb=3ef305b0798bdad70d8b57a606139446507a99e0;p=libsigrok.git diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index f0713010..a6c45e3a 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; @@ -202,7 +200,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) } static struct sr_dev_driver brymen_bm86x_driver_info = { - .name = "brymen-bm86x", + .name = "brymen-bm86x-usb", .longname = "Brymen BM86X", .api_version = 1, .init = std_init,