bin/129268: small patch to let moused detect usb2

[Alex]

>Number:         129268
>Category:       bin
>Synopsis:       small patch to let moused detect usb2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 29 00:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Alex
>Release:        8-CURRENT
>Organization:
>Environment:
FreeBSD moshnroll 8.0-CURRENT FreeBSD 8.0-CURRENT #8 r185353M: Thu Nov 27 01:48:42 CET 2008     root at moshnroll:/usr/obj/usr/src/sys/ARUNDEL  i386
>Description:
at the moment moused is unaware of the usb2 version of ums. if usb2 has been compiled into the kernel e.g. moused still loads the old ums kernel module. with this little patch it's able to detect if the usb2 version of ums is loaded or not. if it isn't it will load the old (usb1) ums kernel module.

cheers.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- usr.sbin/moused/moused.c	2008-11-27 01:28:44.000000000 +0100
+++ usr.sbin/moused/moused.c.new	2008-11-27 01:37:11.000000000 +0100
@@ -956,7 +956,7 @@
 static int
 usbmodule(void)
 {
-    return (kld_isloaded("uhub/ums") || kld_load("ums") != -1);
+    return (kld_isloaded("ushub/ums") || kld_isloaded("uhub/ums") || kld_load("ums") != -1);
 }
 
 /*


>Release-Note:
>Audit-Trail:
>Unformatted: