X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=19192ecbb0b69b404529df45d374be955d1962c9;hp=a159ff003c7f07f7b2669885e87fdbb44d5730b7;hb=56fc0d6dbca2d46ff2a79275ef6307c4e38bf6a1;hpb=d486cbddfe380de95a98646f7626426955e563ee

diff --git a/device.c b/device.c
index a159ff0..19192ec 100644
--- a/device.c
+++ b/device.c
@@ -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++) {