From: mglocker <mglocker@openbsd.org>
Date: Sat, 16 Aug 2008 18:56:07 +0000 (+0000)
Subject: If dwMaxPayloadTransferSize doesn't exactly match to an existing
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e8856c8a02225c4f6d6ca9aab25fe7f118fe8d96;p=openbsd

If dwMaxPayloadTransferSize doesn't exactly match to an existing
endpoint, pick the next higher endpoint bandwidth.
---

diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 4d6b12734ca..9766bbce15f 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.81 2008/08/13 20:29:34 mglocker Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.82 2008/08/16 18:56:07 mglocker Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -916,11 +916,10 @@ uvideo_vs_set_alt(struct uvideo_softc *sc, usbd_interface_handle ifaceh,
 		i++;
 
 		/* save endpoint with requested bandwidth */
-		if (UGETW(ed->wMaxPacketSize) == max_packet_size) {
+		if (UGETW(ed->wMaxPacketSize) >= max_packet_size) {
 			sc->sc_vs_curr->endpoint = ed->bEndpointAddress;
 			sc->sc_vs_curr->curalt = id->bAlternateSetting;
-			sc->sc_vs_curr->max_packet_size =
-			    UGETW(ed->wMaxPacketSize);
+			sc->sc_vs_curr->max_packet_size = max_packet_size;
 			DPRINTF(1, "%s: set alternate iface to ", DEVNAME(sc));
 			DPRINTF(1, "bAlternateSetting=0x%02x\n",
 			    id->bAlternateSetting);