From 38dea3d2412ecdbe2988f58b7ce7a905aff5fb10 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 17 Nov 1999 21:49:12 +0000 Subject: *** empty log message *** --- perl-install/mouse.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'perl-install/mouse.pm') diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 3d2551009..d31041a32 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -111,7 +111,6 @@ sub detect() { eval { commands::modprobe("serial") }; my $r; $r = mouseconfig(); return $r if $r; - modules::unload("serial"); #- my %l; #- eval { commands::modprobe("serial") }; #- @l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) and return \%l; @@ -120,7 +119,7 @@ sub detect() { if (my ($c) = pci_probing::main::probe("SERIAL_USB")) { eval { modules::load($c->[1], 'usbmouse') }; sleep(1); - return name2mouse("USB Mouse") if !$@ && detect_devices::tryOpen("usbmouse"); + do { modules::unload("serial"); return name2mouse("USB Mouse") } if !$@ && detect_devices::tryOpen("usbmouse"); modules::unload($c->[1]); } die "mouseconfig failed"; -- cgit v1.2.1