std: Rename std_dev_clear() to std_dev_clear_with_callback().

[libsigrok.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 9ba8bfc570cb43ed9bec54a661904b45ec6f7e88..069ad1534cf47270155056044bec728ae75c2df8 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -536,10 +536,22 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
                return SR_ERR_ARG;
        }
 
+       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;
+       }
+
+       /* No log message here, too verbose and not very useful. */
+
        if (driver->dev_clear)
                ret = driver->dev_clear(driver);
        else
-               ret = std_dev_clear(driver, NULL);
+               ret = std_dev_clear_with_callback(driver, NULL);
 
        return ret;
 }