From 363aab7a71a0b505c780b763b22bcd5131995382 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Apr 2000 20:59:42 +0000
Subject: no_comment

---
 perl-install/mouse.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/mouse.pm')

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 20509559c..a16c0b1d7 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -136,19 +136,19 @@ sub detect() {
     my ($r, $wacom) = mouseconfig(); return ($r, $wacom) if $r;
 
     require pci_probing::main;
-    if (my ($c) = pci_probing::main::probe("SERIAL_USB")) {
+    if (my ($c) = grep { $_->[1] =~ /usb-/ } pci_probing::main::probe('')) {
 	eval { 
 	    modules::load($c->[1], "SERIAL_USB");
 	    modules::load("usbmouse");
 	    modules::load("mousedev");
 	   };
 	sleep(1);
-	do { 
+	if (!$@ && detect_devices::tryOpen("usbmouse")) {
 	    $wacom or modules::unload("serial"); 
 	    modules::load("usbkbd");
 	    modules::load("keybdev");
 	    return name2mouse("USB Mouse"), $wacom;
-	} if !$@ && detect_devices::tryOpen("usbmouse");
+	}
 	modules::unload("mousedev");
 	modules::unload("usbmouse");
 	modules::unload($c->[1], 'remove_alias');
-- 
cgit v1.2.1