From ac197dc094b09b38b9af0b6d089b2457d98a768b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 6 Jan 2009 15:54:02 +0000 Subject: (pciusb_id) try harder to find duplicates: ignore description for USB devices (especially usefull in order to track eg: input devices whose name differs between ldetect & mouse.pm) [backported from trunk] --- perl-install/harddrake/data.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 64befd576..fb23ebfd4 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -555,7 +555,8 @@ sub pciusb_id { pci_device => 'usb_pci_device', vendor => 'usb_vendor', ); - my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid description)); + my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid), + if_($dev->{bus} !~ /usb/i, 'description')); join(':', map { uc($dev->{$alt{$_}} || $dev->{$_}) } @fields); } -- cgit v1.2.1