diff options
| author | hselasky <hselasky@FreeBSD.org> | 2011-07-02 20:58:33 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2011-07-02 20:58:33 +0000 |
| commit | 2b71135edcb30543aa004ed5c8cbcd4639e84573 (patch) | |
| tree | 0cb8452289efb4071f59207eade192d82b0e048b /sys/dev | |
| parent | e164f9285fa22e26ad10648143a2e7a433e7ce5d (diff) | |
| download | FreeBSD-src-2b71135edcb30543aa004ed5c8cbcd4639e84573.zip FreeBSD-src-2b71135edcb30543aa004ed5c8cbcd4639e84573.tar.gz | |
Fix for "nomatch" event for ums and ukbd drivers when uhid is loaded.
MFC after: 3 days
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/input/uhid.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 1da1203..1b810e3 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -634,6 +634,18 @@ uhid_probe(device_t dev) if (usb_test_quirk(uaa, UQ_HID_IGNORE)) return (ENXIO); + /* + * Don't attach to mouse and keyboard devices, hence then no + * "nomatch" event is generated and then ums and ukbd won't + * attach properly when loaded. + */ + if ((uaa->info.bInterfaceClass == UICLASS_HID) && + (uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) && + ((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) || + (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))) { + return (ENXIO); + } + return (BUS_PROBE_GENERIC); } |
