No need to check return value of libusb_get_device_descriptor().

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 48845c7a2c26b62f37f4bbc23d834d0420b8fc37..50b7df9e423ece744797a9af375bf7af8403a9f3 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define VENDOR_NAME                    "ZEROPLUS"
@@ -174,7 +175,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        devices = NULL;
 
@@ -182,12 +183,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); /* TODO: Errors. */
 
        for (i = 0; devlist[i]; i++) {
-               ret = libusb_get_device_descriptor(devlist[i], &des);
-               if (ret != 0) {
-                       sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(ret));
-                       continue;
-               }
+               libusb_get_device_descriptor(devlist[i], &des);
 
                if ((ret = libusb_open(devlist[i], &hdl)) < 0)
                        continue;
@@ -262,7 +258,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -275,7 +271,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        int device_count, ret, i;
        char connection_id[64];
 
-       drvc = di->priv;
+       drvc = di->context;
        usb = sdi->conn;
 
        if (!(devc = sdi->priv)) {
@@ -592,10 +588,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_OK;
        }
 
-       if (!(buf = g_try_malloc(PACKET_SIZE))) {
-               sr_err("Packet buffer malloc failed.");
-               return SR_ERR_MALLOC;
-       }
+       buf = g_malloc(PACKET_SIZE);
 
        /* Check if the trigger is in the samples we are throwing away */
        trigger_now = now_address == trigger_address ||
@@ -743,5 +736,5 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };