diff options
| author |   mglocker <mglocker@openbsd.org> | 2016-05-26 04:47:08 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2016-05-26 04:47:08 +0000 |
| commit | f20ed7266aed13e59eb959fb949f234306bb29ca (patch) | |
| tree | 259a7015ecb83c81d2add4e492e41bb953a8e876 | |
| parent | Use a fat16 partition starting at sector 2048/1MB everywhere to simplify (diff) | |
| download | wireguard-openbsd-f20ed7266aed13e59eb959fb949f234306bb29ca.tar.xz wireguard-openbsd-f20ed7266aed13e59eb959fb949f234306bb29ca.zip | |
Remove superfluous loop counter to set alternate video interface since we
store the alternate video interface number already.
From Patrick Keshishian, thanks!
| -rw-r--r-- | sys/dev/usb/uvideo.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index d27346f63a1..c63913d2331 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.186 2016/05/20 19:25:53 mglocker Exp $ */ +/* $OpenBSD: uvideo.c,v 1.187 2016/05/26 04:47:08 mglocker Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -1223,11 +1223,10 @@ uvideo_vs_set_alt(struct uvideo_softc *sc, struct usbd_interface *ifaceh, const usb_descriptor_t *desc; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; - int i, diff, best_diff = INT_MAX; + int diff, best_diff = INT_MAX; usbd_status error; uint32_t psize; - i = 0; usbd_desc_iter_init(sc->sc_udev, &iter); desc = usbd_desc_iter_next(&iter); while (desc) { @@ -1245,7 +1244,6 @@ uvideo_vs_set_alt(struct uvideo_softc *sc, struct usbd_interface *ifaceh, if (desc->bDescriptorType != UDESC_ENDPOINT) goto next; ed = (usb_endpoint_descriptor_t *)(uint8_t *)desc; - i++; /* save endpoint with requested bandwidth */ psize = UGETW(ed->wMaxPacketSize); @@ -1271,10 +1269,10 @@ next: sc->sc_vs_cur->curalt, sc->sc_vs_cur->psize, max_packet_size); /* set alternate video stream interface */ - error = usbd_set_interface(ifaceh, i); + error = usbd_set_interface(ifaceh, sc->sc_vs_cur->curalt); if (error) { printf("%s: could not set alternate interface %d!\n", - DEVNAME(sc), i); + DEVNAME(sc), sc->sc_vs_cur->curalt); return (USBD_INVAL); } |