summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2016-05-26 04:47:09 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2016-05-26 04:47:09 +0000
commit4b8daca21546ce9febaba49c00a2801f1c1f8433 (patch)
treee52f9c37708fd4cd42fd259a0ed06115b652104f /sys/dev
parent3bf0e232ac4bf715abb1beb387d1c3f05fb185b1 (diff)
Remove superfluous loop counter to set alternate video interface since we
store the alternate video interface number already. From Patrick Keshishian, thanks!
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uvideo.c10
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);
}