summaryrefslogtreecommitdiffstats
path: root/perl-install/mouse.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
commit363aab7a71a0b505c780b763b22bcd5131995382 (patch)
treeec5940d21c5c321661d981e03a70ab388b183766 /perl-install/mouse.pm
parentc3de4c115afa51c96bdd3684644cae2176f015b4 (diff)
downloaddrakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.gz
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.bz2
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.tar.xz
drakx-backup-do-not-use-363aab7a71a0b505c780b763b22bcd5131995382.zip
no_comment
Diffstat (limited to 'perl-install/mouse.pm')
-rw-r--r--perl-install/mouse.pm6
1 files changed, 3 insertions, 3 deletions
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');