From 8516070b346f74abda18703ab8e04d3ff656e377 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 9 Dec 2008 19:01:30 +0000 Subject: (pciusb_id) try harder to find duplicates: ignore pci bus & function for USB devices (especially usefull in order to track eg: input devices) --- perl-install/harddrake/data.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 9901b3691..64befd576 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -555,7 +555,7 @@ sub pciusb_id { pci_device => 'usb_pci_device', vendor => 'usb_vendor', ); - my @fields = qw(bus pci_bus pci_device vendor id subvendor subid description); + my @fields = ('bus', if_($dev->{bus} =~ /pci/, qw(pci_bus pci_device)), qw(vendor id subvendor subid description)); join(':', map { uc($dev->{$alt{$_}} || $dev->{$_}) } @fields); } -- cgit v1.2.1