summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-09 19:01:30 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-09 19:01:30 +0000
commit8516070b346f74abda18703ab8e04d3ff656e377 (patch)
tree70e750ffd62be43627ef08c9f229a5e076130d58
parent4a047aa78653c653d4cb635f3d00bf1c502c33b9 (diff)
downloaddrakx-8516070b346f74abda18703ab8e04d3ff656e377.tar
drakx-8516070b346f74abda18703ab8e04d3ff656e377.tar.gz
drakx-8516070b346f74abda18703ab8e04d3ff656e377.tar.bz2
drakx-8516070b346f74abda18703ab8e04d3ff656e377.tar.xz
drakx-8516070b346f74abda18703ab8e04d3ff656e377.zip
(pciusb_id) try harder to find duplicates: ignore pci bus & function
for USB devices (especially usefull in order to track eg: input devices)
-rw-r--r--perl-install/harddrake/data.pm2
1 files changed, 1 insertions, 1 deletions
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);
}