diff --git a/pkgtool.pm b/pkgtool.pm
index 1a74fc8..89e8ca2 100644
--- a/pkgtool.pm
+++ b/pkgtool.pm
@@ -3134,18 +3134,21 @@ sub check_if_driver_matches ($$)
 		next unless defined $device;
 		my $busname = $$device{Bus};
 		my $devname = $$device{Device};
-
+#print_log('global', DEBUG1, 'Checking device %s %s', $busname, $devname);
 		my $matches = 0;
 		foreach my $filtrow (@$filter) {
 			my $busfilter = $$filtrow{bus};
 			my $devfilter = $$filtrow{device};
 			next unless defined $busfilter && defined $devfilter;
+#print_log('global', DEBUG1, '  against filter %s %s', $busfilter, $devfilter);
 			next unless $busname =~ /$busfilter/ && $devname =~ /$devfilter/;
+#print_log('global', DEBUG1, '  match found!');
 			$matches = 1;
 			last;
 		}
-		return 1;
+		return 1 if $matches;
 	}
+#print_log('global', DEBUG1, 'No match found');
 
 	return 0;
 }
@@ -3172,8 +3175,6 @@ sub handle_driver ($$$$$$)
 	foreach my $drvname (sort keys %$drvdefs) {
 		my $drvdef = $$drvdefs{$drvname};
 		my $drvinstname = $name.'/'.$drvname;
-
-
 		my $infpath = $$drvdef{'definition-directory'}.'/'.$$drvdef{'inf-file'};
 		my $certpath = defined $$drvdef{'cert-file'} ? $$drvdef{'definition-directory'}.'/'.$$drvdef{'cert-file'} : undef;
 		if (! -r $infpath) {