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
This commit is contained in:
Hans Petter Selasky 2012-03-17 16:40:15 +00:00
parent 0c7a79d76e
commit 9764cfdd05
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=233090

View File

@ -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.
*