summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconvert/merge2pcitable.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index dd8ece28..3efb5d51 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -315,7 +315,8 @@ sub merge {
print STDERR "different($drivers->{$_}[0] $new->{$_}[0]): ", to_string($_, $drivers->{$_}), "\n" if $different;
}
}
- $drivers->{$_}[1] ||= $new->{$_}[1];
+ next if !$new->{$_}[1];
+ $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1] || $drivers->{$_}[1] =~ /\|$/;
} else {
if (!/ffffffff$/ && $new->{$_}[0] eq "unknown") {
# keep sub-entry with major-entry module