X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=4344cf24199e4913b3313d09fafb89abe58f26e1;hb=61136ea6035778f2894a1e32b78f94a0640a5a91;hp=736490feca20e9c3cfa5d2d3b26193c9055f10ff;hpb=40dda2c3a509e9e031078427e32249e2ebc33ec5;p=libsigrok.git

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 736490fe..4344cf24 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -383,22 +383,27 @@ static struct context *fx2lafw_dev_new(void)
  */
 
 static int hw_init(void)
+{
+
+	if (libusb_init(&usb_context) != 0) {
+		sr_warn("fx2lafw: Failed to initialize libusb.");
+		return SR_ERR;
+	}
+
+	return SR_OK;
+}
+
+static int hw_scan(void)
 {
 	struct sr_dev_inst *sdi;
 	struct libusb_device_descriptor des;
 	const struct fx2lafw_profile *prof;
 	struct context *ctx;
 	libusb_device **devlist;
-	int ret;
-	int devcnt = 0;
-	int i, j;
-
-	if (libusb_init(&usb_context) != 0) {
-		sr_warn("fx2lafw: Failed to initialize libusb.");
-		return 0;
-	}
+	int devcnt, ret, i, j;
 
 	/* Find all fx2lafw compatible devices and upload firmware to them. */
+	devcnt = 0;
 	libusb_get_device_list(usb_context, &devlist);
 	for (i = 0; devlist[i]; i++) {
 
@@ -1009,6 +1014,7 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
+	.scan = hw_scan,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
 	.dev_info_get = hw_dev_info_get,