diff options
| author |   martynas <martynas@openbsd.org> | 2008-09-08 19:35:25 +0000 |
|---|---|---|
| committer | martynas <martynas@openbsd.org> | 2008-09-08 19:35:25 +0000 |
| commit | 46ca74eb0be42195789eb571f3fbf78594c0591d (patch) | |
| tree | 14d14d02426a6a7a6e93509c63d93a146cce1a70 | |
| parent | - simplify mget(): remove the duplicate code and just use getit(), (diff) | |
| download | wireguard-openbsd-46ca74eb0be42195789eb571f3fbf78594c0591d.tar.xz wireguard-openbsd-46ca74eb0be42195789eb571f3fbf78594c0591d.zip | |
- don't leave nodes unconfigured, when setting alternate setting
fails. fixes my ups
looked over by fgs@. ok sthen@
| -rw-r--r-- | sys/dev/usb/ugen.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index f43b8d299a2..6e573e12763 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.54 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: ugen.c,v 1.55 2008/09/08 19:35:25 martynas Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -903,7 +903,6 @@ ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int 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; @@ -917,11 +916,13 @@ ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno) /* change setting */ err = usbd_set_interface(iface, altno); if (err) - return (err); + goto out; err = usbd_endpoint_count(iface, &nendpt); if (err) - return (err); + goto out; + +out: for (endptno = 0; endptno < nendpt; endptno++) { ed = usbd_interface2endpoint_descriptor(iface,endptno); endpt = ed->bEndpointAddress; @@ -931,7 +932,7 @@ ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno) sce->edesc = ed; sce->iface = iface; } - return (0); + return (err); } /* Retrieve a complete descriptor for a certain device and index. */ |