summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconvert/merge2pcitable.pl4
1 files changed, 1 insertions, 3 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index c756dcc5..f7c175f6 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -274,6 +274,7 @@ sub merge {
print STDERR "different($drivers->{$_}[0] $new->{$_}[0]): ", to_string($_, $drivers->{$_}), "\n" if $different;
}
}
+ $drivers->{$_}[1] ||= $new->{$_}[1];
} else {
if (!/ffffffff$/ && $new->{$_}[0] eq "unknown") {
# keep sub-entry with major-entry module
@@ -289,9 +290,6 @@ sub merge {
if $all || /ffffffff$/ || $new->{$_}[0] ne "unknown";
}
}
- foreach (keys %$drivers) {
- $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1];
- }
}
sub cleanup_subids {