diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 3abbd1e64..ed1018f2a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,7 @@ - list rt3090sta module in network/wireless +- detect_devices: + o fix merging PCI devices info from sysfs which resulted in + ill-informed devices matching (#57711) Version 12.77.6 - 11 February 2010 - run_program: diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 74c860f02..814499d9a 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -691,7 +691,7 @@ sub get_ids_from_sysfs_device { my $usb_root = -f "$dev_path/bInterfaceNumber" && "../" || -f "$dev_path/idVendor" && ""; my $is_pcmcia = -f "$dev_path/card_id"; my $sysfs_ids; - my $bus = get_sysfs_field_from_link($dev_path, "bus"); + my $bus = get_sysfs_field_from_link($dev_path, "subsystem"); #- FIXME: use $bus if ($is_pcmcia) { $sysfs_ids = { modalias => $dev_cat->('modalias') }; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 320d5a3e1..5dd069d5a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,7 @@ - list rt3090sta module in network/wireless +- detect_devices: + o fix merging PCI devices info from sysfs which resulted in + ill-informed devices matching (#57711) Version 12.77.5 - 09 February 2010 |