diff options
author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2000-07-04 11:44:27 +0000 |
---|---|---|
committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2000-07-04 11:44:27 +0000 |
commit | 90c5f215cf041b9a7e9d4045a6ea32f686e8fc28 (patch) | |
tree | 3405ddc669be426cfa7c9e74b8a655cd8e4c936f /sys/dev/usb/ugen.c | |
parent | c543e41d0e0b608ebd7ae8249f32fc3b6ac1ad42 (diff) |
sync with NetBSD... well almost. someone w/ the hw should check umass.
Diffstat (limited to 'sys/dev/usb/ugen.c')
-rw-r--r-- | sys/dev/usb/ugen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 4b391760f82..6f3221bfe73 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.10 2000/03/30 16:19:33 aaron Exp $ */ +/* $OpenBSD: ugen.c,v 1.11 2000/07/04 11:44:23 fgsch Exp $ */ /* $NetBSD: ugen.c,v 1.37 2000/03/27 12:33:55 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -7,7 +7,7 @@ * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (augustss@carlstedt.se) at + * by Lennart Augustsson (lennart@augustsson.net) at * Carlstedt Research & Technology. * * Redistribution and use in source and binary forms, with or without @@ -758,6 +758,7 @@ ugen_set_interface(sc, ifaceidx, altno) err = usbd_endpoint_count(iface, &nendpt); if (err) return (err); + /* XXX should only do this after setting new altno has succeeded */ for (endptno = 0; endptno < nendpt; endptno++) { ed = usbd_interface2endpoint_descriptor(iface,endptno); endpt = ed->bEndpointAddress; @@ -835,7 +836,7 @@ ugen_get_alt_index(sc, ifaceidx) err = usbd_device2interface_handle(sc->sc_udev, ifaceidx, &iface); if (err) - return (-1); + return (-1); return (usbd_get_interface_altindex(iface)); } |