From 114baaa2496fe0b4f702459ece654a18b4489ac9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 4 Jul 2008 00:34:59 -0300 Subject: [PATCH] --- yaml --- r: 103927 b: refs/heads/master c: 233548a2fd934a0220db8b1521c0bc88c82e5e53 h: refs/heads/master i: 103925: 8f391fd2eb6200d4bd1586d84201dd7d0bd57c79 103923: a1389e1fbb734bf67a5d932d5df4fc910644f610 103919: 17e6464c1e489d1a9477f2ae4386161e49eef444 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46669abee7ea..449d038535d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 553b9fa47d67a77f6456bc969891a347bfb323dc +refs/heads/master: 233548a2fd934a0220db8b1521c0bc88c82e5e53 diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c index 60ced589f898..86bb16d00173 100644 --- a/trunk/drivers/media/video/uvc/uvc_driver.c +++ b/trunk/drivers/media/video/uvc/uvc_driver.c @@ -298,7 +298,8 @@ static int uvc_parse_format(struct uvc_device *dev, switch (buffer[2]) { case VS_FORMAT_UNCOMPRESSED: case VS_FORMAT_FRAME_BASED: - if (buflen < 27) { + n = buffer[2] == VS_FORMAT_UNCOMPRESSED ? 27 : 28; + if (buflen < n) { uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" "interface %d FORMAT error\n", dev->udev->devnum,