diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-04-14 22:50:30 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-04-14 22:50:30 +0000 |
| commit | 991040652a68096f72fa44929e5d73800c044538 (patch) | |
| tree | 952b80839b97ddc3e3a64e5e2fa4d0a5fe7a8a50 /sys/dev/usb/hid.c | |
| parent | 765944befb7871794d0edd9124f922f86d9324bc (diff) | |
Sync with NetBSD.
Diffstat (limited to 'sys/dev/usb/hid.c')
| -rw-r--r-- | sys/dev/usb/hid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c index 123cccc44e4..603f3d49597 100644 --- a/sys/dev/usb/hid.c +++ b/sys/dev/usb/hid.c @@ -1,5 +1,5 @@ -/* $OpenBSD: hid.c,v 1.6 2000/03/30 16:19:32 aaron Exp $ */ -/* $NetBSD: hid.c,v 1.13 2000/03/27 12:33:53 augustss Exp $ */ +/* $OpenBSD: hid.c,v 1.7 2000/04/14 22:50:24 aaron Exp $ */ +/* $NetBSD: hid.c,v 1.14 2000/04/06 22:58:32 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */ /* @@ -127,7 +127,7 @@ hid_get_item(s, h) { struct hid_item *c = &s->cur; unsigned int bTag, bType, bSize; - struct hid_location oldloc; + u_int32_t oldpos; u_char *data; int32_t dval; u_char *p; @@ -301,9 +301,9 @@ hid_get_item(s, h) break; case 11: /* Pop */ hi = c->next; - oldloc = c->loc; + oldpos = c->loc.pos; s->cur = *hi; - c->loc = oldloc; + c->loc.pos = oldpos; free(hi, M_TEMP); break; default: |