From 3316321e6ed900bceb26be153e0e10dccbf8508e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 9 Apr 2013 06:00:27 +0000
Subject: list HID USB devices with keyboards

---
 perl-install/NEWS              | 1 +
 perl-install/harddrake/data.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index a0a8bbbd8..74ae9906f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,7 @@
   o allow to choose btrfs in normal mode (mga#65)
 - harddrake:
   o fix displayed PCI/USB ids (spot in mga#9674)
+  o list HID USB devices with keyboards
 
 Version 15.36 - 6 April 2013
 
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 76ba48531..7c8b95198 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -477,7 +477,7 @@ our @tree =
       detector => sub {
           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} =~ /^event|kbd/ && $_->{description} !~ /PC Speaker/;
+                     $_->{bus} ne 'usb' && $_->{driver} =~ /^event|kbd|^usbhid/ && $_->{description} !~ /PC Speaker/;
                  } @devices);
       },
       checked_on_boot => 0,
-- 
cgit v1.2.1