brymen-bm86x: avoid NULL deref when usb->devhdl does not exist

[libsigrok.git] / src / hardware / brymen-bm86x / api.c

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index d9575c00ffeb71bb2f9f9b601f366bf8a98b15dc..f0713010ea820ac60706f987ace12ec3545b81a4 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -101,7 +101,6 @@ static int dev_open(struct sr_dev_inst *sdi)
        if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) < 0)
                return SR_ERR;
 
-       /* Detach kernel drivers which grabbed this device (if any). */
        if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
                ret = libusb_detach_kernel_driver(usb->devhdl, 0);
                if (ret < 0) {
@@ -112,7 +111,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                devc->detached_kernel_driver = 1;
        }
 
-       /* Claim interface 0. */
        if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
                sr_err("Failed to claim interface 0: %s.",
                       libusb_error_name(ret));
@@ -131,6 +129,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));
 
@@ -147,8 +148,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        return (ret == 0) ? SR_OK : SR_ERR;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc = sdi->priv;
 
@@ -157,8 +158,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return sr_sw_limits_config_get(&devc->sw_limits, key, data);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -169,8 +170,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return sr_sw_limits_config_set(&devc->sw_limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }