kfg/winupd
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed extra driver device ID matching code.

Browse source
This commit is contained in:
László Valkó 2019-04-15 02:05:56 +02:00
parent 7f40d4e255
commit 10402594c1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgtool.pm
View file

@ -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) {