summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2022-11-04 19:46:55 +0000
committerjmcneill <jmcneill@NetBSD.org>2022-11-04 19:46:55 +0000
commiteeb87362659bb1e55531c3dddef5feb4e07a8bf3 (patch)
tree8f5e528df2cfa9216192ee5664d6530ddf909aca /sys/dev/usb
parent4dedf99cc0724601e484a45e3edb123214a12ac1 (diff)
Back out r1.82 ("Do not explicitly set the HID Report Protocol upon attach")
due to the regression reported in PR# 57031
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/uhidev.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 0938041e73a..ac299b02f38 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.93 2022/03/28 12:44:45 riastradh Exp $ */
+/* $NetBSD: uhidev.c,v 1.94 2022/11/04 19:46:55 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.93 2022/03/28 12:44:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.94 2022/11/04 19:46:55 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -223,16 +223,8 @@ uhidev_attach(device_t parent, device_t self, void *aux)
}
(void)usbd_set_idle(iface, 0, 0);
-#if 0
- /*
- * HID 1.11 says we should do this, but the device firmware is
- * supposed to come up in Report Protocol after reset anyway, and
- * apparently explicitly requesting it confuses some devices.
- */
- if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0 &&
- id->bInterfaceSubClass == UISUBCLASS_BOOT)
+ if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0)
(void)usbd_set_protocol(iface, 1);
-#endif
maxinpktsize = 0;
sc->sc_iep_addr = sc->sc_oep_addr = -1;