diff options
Diffstat (limited to 'convert')
| -rwxr-xr-x | convert/merge2pcitable.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index 4ca54256..c756dcc5 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -260,9 +260,6 @@ sub write_pcitable { sub merge { my ($drivers, $new) = @_; - foreach (keys %$drivers) { - $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1]; - } foreach (keys %$new) { next if $new->{$_}[0] =~ /parport_pc|i810_ng/; if ($drivers->{$_}) { @@ -292,6 +289,9 @@ sub merge { if $all || /ffffffff$/ || $new->{$_}[0] ne "unknown"; } } + foreach (keys %$drivers) { + $drivers->{$_}[1] = $new->{$_}[1] if !$drivers->{$_}[1]; + } } sub cleanup_subids { |