X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=19192ecbb0b69b404529df45d374be955d1962c9;hb=e8a9eb8d33617a5210a1c10d1855a8482bd85080;hp=df7a7ed6d8ad4de2f29cda9c4455de0188a30969;hpb=21964baec4fe7cf0997f75dec6a837d93f12a4c8;p=sigrok-cli.git

diff --git a/device.c b/device.c
index df7a7ed..19192ec 100644
--- a/device.c
+++ b/device.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include "sigrok-cli.h"
-#include "config.h"
 
 static void free_drvopts(struct sr_config *src)
 {
@@ -35,12 +35,16 @@ GSList *device_scan(void)
 	int i;
 
 	if (opt_drv) {
+		/* Caller specified driver. Use it. Only this one. */
 		if (!parse_driver(opt_drv, &driver, &drvopts))
 			return NULL;
 		devices = sr_driver_scan(driver, drvopts);
 		g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
+	} else if (opt_dont_scan) {
+		/* No -d choice, and -D "don't scan" requested. Do nothing. */
+		devices = NULL;
 	} else {
-		/* No driver specified, let them all scan on their own. */
+		/* No driver specified. Scan all available drivers. */
 		devices = NULL;
 		drivers = sr_driver_list(sr_ctx);
 		for (i = 0; drivers[i]; i++) {