sysclk-lwla: Declare model_info structs as extern

[libsigrok.git] / src / hardware / sysclk-lwla / api.c

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index ba9ca4fa7dd60ae275f094c1336c0cd3f6d18d91..891062560b0d5a09e86d5c24928a38dec6441ce3 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
-#include "libsigrok-internal.h"
+#include <libsigrok-internal.h>
 #include "protocol.h"
 
 /* Supported device scan options.
@@ -264,7 +264,7 @@ static int drain_usb(struct sr_usb_dev_inst *usb, unsigned int endpoint)
        do {
                xfer_len = 0;
                ret = libusb_bulk_transfer(usb->devhdl, endpoint,
-                                          buf, sizeof buf, &xfer_len,
+                                          buf, sizeof(buf), &xfer_len,
                                           drain_timeout_ms);
                drained += xfer_len;
        } while (ret == LIBUSB_SUCCESS && xfer_len != 0);
@@ -325,8 +325,10 @@ static int dev_open(struct sr_dev_inst *sdi)
        }
 
        ret = drain_usb(usb, EP_REPLY);
-       if (ret != SR_OK)
+       if (ret != SR_OK) {
+               sr_usb_close(usb);
                return ret;
+       }
 
        sdi->status = SR_ST_ACTIVE;