diff options
| author |   mglocker <mglocker@openbsd.org> | 2011-10-28 12:48:31 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2011-10-28 12:48:31 +0000 |
| commit | ec097858b47c2f8ee705fcf5fdc99ce75a6ced21 (patch) | |
| tree | 2ca667b00699fa6ecc846d3df3069b60ce1b6a20 | |
| parent | use existing _ppp instead of _npppd as a user/group id for npppd. (diff) | |
| download | wireguard-openbsd-ec097858b47c2f8ee705fcf5fdc99ce75a6ced21.tar.xz wireguard-openbsd-ec097858b47c2f8ee705fcf5fdc99ce75a6ced21.zip | |
Fix bogus frame selection check in uvideo_vs_negotiation().
From Pedro Martelletto
| -rw-r--r-- | sys/dev/usb/uvideo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 0e3dd60d3c7..abaf9ed5d9d 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.165 2011/09/18 23:24:12 krw Exp $ */ +/* $OpenBSD: uvideo.c,v 1.166 2011/10/28 12:48:31 mglocker Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -1414,11 +1414,11 @@ uvideo_vs_negotiation(struct uvideo_softc *sc, int commit) frame = fmtgrp->frame[i]; break; } - if (i == fmtgrp->frame_num) { - DPRINTF(1, "%s: %s: invalid frame index 0x%x\n", - DEVNAME(sc), __func__, pc->bFrameIndex); - return (USBD_INVAL); - } + } + if (i == fmtgrp->frame_num) { + DPRINTF(1, "%s: %s: invalid frame index 0x%x\n", + DEVNAME(sc), __func__, pc->bFrameIndex); + return (USBD_INVAL); } } else frame = fmtgrp->frame_cur; |