diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-11-17 21:49:12 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-11-17 21:49:12 +0000 |
| commit | 38dea3d2412ecdbe2988f58b7ce7a905aff5fb10 (patch) | |
| tree | 6a4930b84e120014513038548a797eab8ef1035f /perl-install/mouse.pm | |
| parent | 0eba4a2a3ff3e37bb8a08477f556fe3f97351d7b (diff) | |
| download | drakx-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar drakx-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.gz drakx-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.bz2 drakx-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.tar.xz drakx-38dea3d2412ecdbe2988f58b7ce7a905aff5fb10.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/mouse.pm')
| -rw-r--r-- | perl-install/mouse.pm | 3 |
1 files changed, 1 insertions, 2 deletions
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"; |