From fee04c204ed726e8428fdaeea83f9b1dc18478b3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 3 Dec 2004 10:21:58 +0000 Subject: overwrite bogus descriptions (aka "vendor|") with proper ones (aka "vendor|device") from {pci,usb}.ids --- convert/merge2pcitable.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1