summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/usbdi.c
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>1999-01-22 00:51:12 +0000
committern_hibma <n_hibma@FreeBSD.org>1999-01-22 00:51:12 +0000
commit7824a7cd281c653055ce19b159c4e96c999fcdaf (patch)
tree4b96ca7b19893ffd4e14f88fd23e637d18ee4198 /sys/dev/usb/usbdi.c
parentd7d000c63871de531d26264ef6a7c27ddf4eed16 (diff)
downloadFreeBSD-src-7824a7cd281c653055ce19b159c4e96c999fcdaf.zip
FreeBSD-src-7824a7cd281c653055ce19b159c4e96c999fcdaf.tar.gz
Textual changes
Diffstat (limited to 'sys/dev/usb/usbdi.c')
-rw-r--r--sys/dev/usb/usbdi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index e1ed20a..30d171c 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,5 +1,5 @@
/* $NetBSD: usbdi.c,v 1.20 1999/01/08 11:58:26 augustss Exp $ */
-/* FreeBSD $Id: usbdi.c,v 1.7 1999/01/07 23:31:42 n_hibma Exp $ */
+/* $FreeBSD$ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -418,14 +418,14 @@ usbd_abort_pipe(pipe)
usbd_pipe_handle pipe;
{
usbd_status r;
- int s, st;
+ int s, state;
if (pipe->iface->state != USBD_INTERFACE_ACTIVE)
return (USBD_INTERFACE_NOT_ACTIVE);
s = splusb();
- st = pipe->state;
+ state = pipe->state;
r = usbd_ar_pipe(pipe);
- pipe->state = st;
+ pipe->state = state;
splx(s);
return (r);
}
@@ -664,9 +664,7 @@ usbd_bus_count()
{
return (usb_bus_count());
}
-#endif
-#if defined(__NetBSD__)
usbd_status
usbd_get_bus_handle(index, bus)
u_int8_t index;
@@ -1251,7 +1249,7 @@ usbd_driver_load(module_t mod, int what, void *arg)
if (error)
return 0; /* XXX maybe transient, or error? */
- for (devcount--; devcount >= 0; devcount--)
+ for (; devcount; devcount--)
USB_RECONFIGURE(devlist[devcount]);
free(devlist, M_TEMP);
OpenPOWER on IntegriCloud