Module Name: src
Committed By: phx
Date: Fri Nov 19 18:27:13 UTC 2010
Modified Files:
src/sys/arch/macppc/dev: pbms.c
Log Message:
Make sure the interface protocol is UIPROTO_MOUSE, before we attach.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/pbms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.10 src/sys/arch/macppc/dev/pbms.c:1.11
--- src/sys/arch/macppc/dev/pbms.c:1.10 Mon Nov 8 12:06:47 2010
+++ src/sys/arch/macppc/dev/pbms.c Fri Nov 19 18:27:12 2010
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.10 2010/11/08 12:06:47 pooka Exp $ */
+/* $Id: pbms.c,v 1.11 2010/11/19 18:27:12 phx Exp $ */
/*
* Copyright (c) 2005, Johan Wall�n
@@ -301,7 +301,8 @@
* We just check if the vendor and product IDs have the magic numbers
* we expect.
*/
- if ((udd = usbd_get_device_descriptor(uha->parent->sc_udev)) != NULL) {
+ if (uha->uaa->proto == UIPROTO_MOUSE &&
+ (udd = usbd_get_device_descriptor(uha->parent->sc_udev)) != NULL) {
vendor = UGETW(udd->idVendor);
product = UGETW(udd->idProduct);
for (i = 0; i < PBMS_NUM_DEVICES; i++) {
