summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjdc <jdc@NetBSD.org>2010-03-07 11:28:46 +0000
committerjdc <jdc@NetBSD.org>2010-03-07 11:28:46 +0000
commit03d5670940d2fb95516ec7634d92135aa42e851d (patch)
treefd6efabf6c52f850fe5809bea5cc875b657a03a4 /sys/dev
parent844288483e3c31f2f22ce39cbb83975e6d66f7ec (diff)
s/delay/need_delay/ to get rid of shadowed variable warning (some
ports define delay in machine/param.h).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uthum.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index f3d0e9d9dfd..e073d4d432b 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.3 2010/03/06 04:39:16 cnst Exp $ */
+/* $NetBSD: uthum.c,v 1.4 2010/03/07 11:28:46 jdc Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -248,7 +248,7 @@ uthum_intr(struct uhidev *addr, void *ibuf, u_int len)
int
uthum_read_data(struct uthum_softc *sc, uint8_t target_cmd, uint8_t *buf,
- size_t len, int delay)
+ size_t len, int need_delay)
{
int i;
uint8_t cmdbuf[32], report[256];
@@ -282,8 +282,8 @@ uthum_read_data(struct uthum_softc *sc, uint8_t target_cmd, uint8_t *buf,
return EIO;
/* wait if required */
- if (delay > 1)
- tsleep(&sc->sc_sme, 0, "uthum", (delay*hz+999)/1000 + 1);
+ if (need_delay > 1)
+ tsleep(&sc->sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
/* get answer */
if (uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,