From c7e9666e7d6808792801ac1ebdcc0cae452dd148 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 6 Jan 2009 15:53: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)
 [backported from trunk]

---
 perl-install/harddrake/data.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install')

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