From 20c9f3614ae4b20fdd33c4e086c5725653b9fe3f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 9 Dec 2008 19:04:20 +0000
Subject: no need to probe input devices thrice (they are already listed in
 @devices through detect_devices::probe_all() -> getInputDevices_and_usb() ->
 getInputDevices())

---
 perl-install/harddrake/data.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'perl-install/harddrake')

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index fb23ebfd4..9d538c0aa 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -476,9 +476,10 @@ our @tree =
       icon => "hw-keyboard.png",
       configurator => "$sbindir/keyboarddrake",
       detector => sub {
-          f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i } @devices),
-            # USB devices are filtered out since we already catch them through probeall():
-          f(grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/ } detect_devices::getInputDevices());
+          f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i ||
+                     # USB devices are filtered out since we already catch them through probeall():
+                     $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/
+                 } @devices),
       },
       checked_on_boot => 0,
      },
@@ -498,9 +499,10 @@ our @tree =
       icon => "hw_mouse.png",
       configurator => "$sbindir/mousedrake",
       detector => sub {
-          f(grep { $_->{driver} =~ /^Mouse:|^Tablet:/ || $_->{media_type} =~ /class\|Mouse/ } @devices),
-            # USB devices are filtered out since we already catch them through probeall():
-            f(grep { $_->{bus} ne 'usb' && $_->{Handlers}{mouse} } detect_devices::getInputDevices());
+          f(grep { $_->{driver} =~ /^Mouse:|^Tablet:/ || $_->{media_type} =~ /class\|Mouse/ ||
+                     # USB devices are filtered out since we already catch them through probeall():
+                     $_->{bus} ne 'usb' && $_->{Handlers}{mouse}
+                 } @devices),
       },
       checked_on_boot => 1,
       automatic => 1,
-- 
cgit v1.2.1