summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-03 11:40:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-03 11:40:54 +0000
commitc5caa4bfa6e340bb56786f1496f15b6af7c99f8f (patch)
tree38a608c9139770f9347a4d7fe8244dc58a6589fd
parent4b131a40ef11e7a4ec7f9538a00a93438cc38c10 (diff)
downloadldetect-lst-c5caa4bfa6e340bb56786f1496f15b6af7c99f8f.tar
ldetect-lst-c5caa4bfa6e340bb56786f1496f15b6af7c99f8f.tar.gz
ldetect-lst-c5caa4bfa6e340bb56786f1496f15b6af7c99f8f.tar.bz2
ldetect-lst-c5caa4bfa6e340bb56786f1496f15b6af7c99f8f.tar.xz
ldetect-lst-c5caa4bfa6e340bb56786f1496f15b6af7c99f8f.zip
do it a little more cleanly
-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 {