svn commit: r242281 - stable/9/sys/dev/usb/input

[Eitan Adler]

Author: eadler
Date: Mon Oct 29 03:48:25 2012
New Revision: 242281
URL: http://svn.freebsd.org/changeset/base/242281

Log:
  MFC r241843:
  	Make uhid attach to devices that look like keyboards
  	or mice if the quirk which prevents higher level
  	drivers from attaching is set.
  
  PR:		usb/172458
  Approved by:	cperciva (implicit)

Modified:
  stable/9/sys/dev/usb/input/uhid.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/input/uhid.c
==============================================================================
--- stable/9/sys/dev/usb/input/uhid.c	Mon Oct 29 03:48:24 2012	(r242280)
+++ stable/9/sys/dev/usb/input/uhid.c	Mon Oct 29 03:48:25 2012	(r242281)
@@ -691,10 +691,11 @@ uhid_probe(device_t dev)
 	 */
 	if ((uaa->info.bInterfaceClass == UICLASS_HID) &&
 	    (uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
-	    ((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) ||
-	     (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))) {
+	    (((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) &&
+	      !usb_test_quirk(uaa, UQ_KBD_IGNORE)) ||
+	     ((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) &&
+	      !usb_test_quirk(uaa, UQ_UMS_IGNORE))))
 		return (ENXIO);
-	}
 
 	return (BUS_PROBE_GENERIC);
 }