summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthieu <matthieu@openbsd.org>2013-07-01 20:34:52 +0000
committermatthieu <matthieu@openbsd.org>2013-07-01 20:34:52 +0000
commit34c336f8db11f95faf2d4b61f0867267b2caea0c (patch)
tree1fd8810a13bb4a7ba1e2f871b2882b1ee8d9464b
parentThe fast scrolling code causes random page table errors on older hardware. (diff)
downloadwireguard-openbsd-34c336f8db11f95faf2d4b61f0867267b2caea0c.tar.xz
wireguard-openbsd-34c336f8db11f95faf2d4b61f0867267b2caea0c.zip
Pass ioctl() calls to parent uhidev() device first, to be able to
get the HID descriptor with usbhidctl -r, among others. ok mpi@
-rw-r--r--sys/dev/usb/uhts.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/usb/uhts.c b/sys/dev/usb/uhts.c
index f4cf6a9786b..3104cbab7a9 100644
--- a/sys/dev/usb/uhts.c
+++ b/sys/dev/usb/uhts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhts.c,v 1.6 2013/03/28 03:58:03 tedu Exp $ */
+/* $OpenBSD: uhts.c,v 1.7 2013/07/01 20:34:52 matthieu Exp $ */
/*
* Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu>
* Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -357,11 +357,15 @@ uhts_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
{
struct uhts_softc *sc = v;
struct wsmouse_calibcoords *wsmc = (struct wsmouse_calibcoords *)data;
- int error = 0;
+ int rc, error = 0;
DPRINTF(("uhts_ioctl(%d, '%c', %d)\n",
IOCPARM_LEN(cmd), IOCGROUP(cmd), cmd & 0xff));
+ rc = uhidev_ioctl(&sc->sc_hdev, cmd, data, flag, p);
+ if (rc != -1)
+ return rc;
+
switch (cmd) {
case WSMOUSEIO_GTYPE:
*(u_int *)data = WSMOUSE_TYPE_TPANEL;