[src/trunk]: src/sys/dev/usb Avoid treating the Griffin PowerMate knob as a u...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c818080e2446
branches:  trunk
changeset: 750734:c818080e2446
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Jan 12 16:18:58 2010 +0000

description:
Avoid treating the Griffin PowerMate knob as a ums(4).
Should fix PR/19445.

diffstat:

 sys/dev/usb/ums.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 5b6652ba3e13 -r c818080e2446 sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Tue Jan 12 15:51:01 2010 +0000
+++ b/sys/dev/usb/ums.c Tue Jan 12 16:18:58 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.78 2009/12/30 20:38:47 jakllsch Exp $        */
+/*     $NetBSD: ums.c,v 1.79 2010/01/12 16:18:58 jakllsch Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.78 2009/12/30 20:38:47 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.79 2010/01/12 16:18:58 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,6 +135,14 @@
        int size;
        void *desc;
 
+       /*
+        * Some (older) Griffin PowerMate knobs may masquerade as a
+        * mouse, avoid treating them as such, they have only one axis.
+        */
+       if (uha->uaa->vendor == USB_VENDOR_GRIFFIN &&
+           uha->uaa->product == USB_PRODUCT_GRIFFIN_POWERMATE)
+               return (UMATCH_NONE);
+
        uhidev_get_report_desc(uha->parent, &desc, &size);
        if (!hid_is_collection(desc, size, uha->reportid,
                               HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)) &&