summaryrefslogtreecommitdiffstats
path: root/usr.sbin/moused
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2012-03-17 16:40:15 +0000
committerhselasky <hselasky@FreeBSD.org>2012-03-17 16:40:15 +0000
commite1da8f7c606cd0b1a8fe8d813288c624ddd42ca3 (patch)
tree75df18eb8ead7a85b1347acbc61ab068318b329b /usr.sbin/moused
parent9608a1f31cb909510803a8b85a5a76006b2cd121 (diff)
downloadFreeBSD-src-e1da8f7c606cd0b1a8fe8d813288c624ddd42ca3.zip
FreeBSD-src-e1da8f7c606cd0b1a8fe8d813288c624ddd42ca3.tar.gz
The UMS module is now loaded by rules in /etc/devd/usb.conf which
are executed by devd. Remove duplicate kldload. Reported by: joel @ MFC after: 1 week
Diffstat (limited to 'usr.sbin/moused')
-rw-r--r--usr.sbin/moused/moused.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 39c2eb9..78e65fa 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -564,8 +564,6 @@ static void mremote_clientchg(int add);
static int kidspad(u_char rxc, mousestatus_t *act);
static int gtco_digipad(u_char, mousestatus_t *);
-static int usbmodule(void);
-
int
main(int argc, char *argv[])
{
@@ -880,8 +878,7 @@ main(int argc, char *argv[])
retry = 1;
if (strncmp(rodent.portname, "/dev/ums", 8) == 0) {
- if (usbmodule() != 0)
- retry = 5;
+ retry = 5;
}
for (;;) {
@@ -953,12 +950,6 @@ main(int argc, char *argv[])
exit(0);
}
-static int
-usbmodule(void)
-{
- return (kld_isloaded("uhub/ums") || kld_load("ums") != -1);
-}
-
/*
* Function to calculate linear acceleration.
*
OpenPOWER on IntegriCloud