summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakemsr <jakemsr@openbsd.org>2010-10-18 23:20:15 +0000
committerjakemsr <jakemsr@openbsd.org>2010-10-18 23:20:15 +0000
commit2cef43046d8b332e9a2641e0f68d9fa6b3cde3d6 (patch)
treec46db3e82249ff0b27c3813929f2207ebdc22ae9
parentuse setting with closest matching bandwidth for the current configuration (diff)
downloadwireguard-openbsd-2cef43046d8b332e9a2641e0f68d9fa6b3cde3d6.tar.xz
wireguard-openbsd-2cef43046d8b332e9a2641e0f68d9fa6b3cde3d6.zip
when configuring the streaming interface with the video probe and
commit controls, use the hardware frame idenfitier instead of the software identifier since they can differ, and the hardware only knows about it's own identifiers
-rw-r--r--sys/dev/usb/uvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 8d97b9a5e12..0fa41d4a502 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.143 2010/10/18 23:12:40 jakemsr Exp $ */
+/* $OpenBSD: uvideo.c,v 1.144 2010/10/18 23:20:15 jakemsr Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -1346,7 +1346,7 @@ uvideo_find_res(struct uvideo_softc *sc, int idx, int width, int height,
diff_best = diff;
r->width = w;
r->height = h;
- r->fidx = i;
+ r->fidx = sc->sc_fmtgrp[idx].frame[i]->bFrameIndex;
}
DPRINTF(1, "%s: %s: frame index %d: width=%d, height=%d\n",
DEVNAME(sc), __func__, i, w, h);