summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuo <yuo@openbsd.org>2009-12-17 08:28:03 +0000
committeryuo <yuo@openbsd.org>2009-12-17 08:28:03 +0000
commit03f789bea1961f9880e05e701c24fb7985cb84ff (patch)
tree878636cdfac04213be83001a1f66261e26574af9
parentdisplay progressmeter at 0% at start of install/deinstall. (diff)
downloadwireguard-openbsd-03f789bea1961f9880e05e701c24fb7985cb84ff.tar.xz
wireguard-openbsd-03f789bea1961f9880e05e701c24fb7985cb84ff.zip
fix softc structure to fit as uhid sub device.
ok deraadt@
-rw-r--r--sys/dev/usb/uthum.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index e344196fe3a..21d177bc778 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthum.c,v 1.4 2009/12/10 04:44:27 deraadt Exp $ */
+/* $OpenBSD: uthum.c,v 1.5 2009/12/17 08:28:03 yuo Exp $ */
/*
* Copyright (c) 2009 Yojiro UO <yuo@nui.org>
@@ -66,7 +66,6 @@ static uint8_t cmd_end[8] =
#define UTHUM_TYPE_SHT1x 1
struct uthum_softc {
- struct device sc_dev;
struct uhidev sc_hdev;
usbd_device_handle sc_udev;
u_char sc_dying;
@@ -177,7 +176,7 @@ uthum_attach(struct device *parent, struct device *self, void *aux)
sc->sc_sensortype = uthum_check_sensortype(sc);
/* attach sensor */
- strlcpy(sc->sc_sensordev.xname, sc->sc_dev.dv_xname,
+ strlcpy(sc->sc_sensordev.xname, sc->sc_hdev.sc_dev.dv_xname,
sizeof(sc->sc_sensordev.xname));
switch (sc->sc_sensortype) {