hwdriver.c: Fix two scan-build warnings.

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 9ba8bfc570cb43ed9bec54a661904b45ec6f7e88..519a1726399b060719df6c43f2432900266e3273 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -529,19 +529,24 @@ SR_API GSList *sr_dev_list(const struct sr_dev_driver *driver)
  */
 SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
 {
-       int ret;
-
        if (!driver) {
                sr_err("Invalid driver.");
                return SR_ERR_ARG;
        }
 
-       if (driver->dev_clear)
-               ret = driver->dev_clear(driver);
-       else
-               ret = std_dev_clear(driver, NULL);
+       if (!driver->context) {
+               /*
+                * Driver was never initialized, nothing to do.
+                *
+                * No log message since this usually gets called for all
+                * drivers, whether they were initialized or not.
+                */
+               return SR_OK;
+       }
 
-       return ret;
+       /* No log message here, too verbose and not very useful. */
+
+       return driver->dev_clear(driver);
 }
 
 /**
@@ -605,8 +610,6 @@ SR_API int sr_dev_open(struct sr_dev_inst *sdi)
  */
 SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 {
-       int ret;
-
        if (!sdi || !sdi->driver || !sdi->driver->dev_close)
                return SR_ERR_ARG;
 
@@ -620,9 +623,7 @@ SR_API int sr_dev_close(struct sr_dev_inst *sdi)
 
        sr_dbg("%s: Closing device instance.", sdi->driver->name);
 
-       ret = sdi->driver->dev_close(sdi);
-
-       return ret;
+       return sdi->driver->dev_close(sdi);
 }
 
 /**
@@ -752,7 +753,9 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
                        if (b != usb->bus || a != usb->address)
                                continue;
 
-                       usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+                       if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+                               continue;
+
                        ((struct sr_dev_inst *)sdi)->connection_id = g_strdup(connection_id);
                        break;
                }