X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=1394fb3be34b6aa874dab6e15e111a5d01d58a66;hb=91057d2fc24c0ca058aa08c8ea6ada4eadf05ffd;hp=9ba8bfc570cb43ed9bec54a661904b45ec6f7e88;hpb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;p=libsigrok.git

diff --git a/src/device.c b/src/device.c
index 9ba8bfc5..1394fb3b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -536,6 +536,18 @@ 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