From 8c19f25700b78c120b416adc556f67cd6280354a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 9 Apr 2013 05:46:16 +0000
Subject: fix displayed PCI/USB ids (spot in mga#9674)

---
 perl-install/NEWS              | 2 ++
 perl-install/detect_devices.pm | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index e8bddc0ea..c0a79a908 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
     online media are not setup (for live)
 - diskdrake:
   o allow to choose btrfs in normal mode (mga#65)
+- harddrake:
+  o fix displayed PCI/USB ids (spot in mga#9674)
 
 Version 15.36 - 6 April 2013
 
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 6617fcd59..08d344fac 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -847,7 +847,6 @@ my (@pci, @usb);
 sub pci_probe__real() {
     add_addons($pcitable_addons, map {
 	my $l = $_;
-	$l->{$_} = hex $l->{$_} foreach qw(vendor id subvendor subid);
 	$l->{bus} = 'PCI';
 	$l->{sysfs_device} = '/sys/bus/pci/devices/' . get_pci_sysfs_path($l);
 	$l;
@@ -870,7 +869,6 @@ sub usb_probe__real() {
     add_addons($usbtable_addons, map {
 	my $l = $_;
 	$l->{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l->{media_type}));
-	$l->{$_} = hex $l->{$_} foreach qw(vendor id);
 	$l->{sysfs_device} = "/sys/bus/usb/devices/$l->{pci_bus}-" . ($l->{usb_port} + 1);
 	$l->{bus} = 'USB';
 	$l;
-- 
cgit v1.2.1