From ca30a5ec1449bcfae71d475898845f50bdefbed9 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 8 Oct 2012 06:05:24 -0300
Subject: [PATCH] --- yaml --- r: 343905 b: refs/heads/master c:
 bb969707f99e12f7fbb21b261b33de16e3e4b31e h: refs/heads/master i:   343903:
 c01559be2c44a31a417aefa3b65cde198e77556d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/usb/pwc/pwc-ctrl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4a100187ec4..d51983b08303 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b34e9d1beb546afd7586845775f2d1272a08a4a
+refs/heads/master: bb969707f99e12f7fbb21b261b33de16e3e4b31e
diff --git a/trunk/drivers/media/usb/pwc/pwc-ctrl.c b/trunk/drivers/media/usb/pwc/pwc-ctrl.c
index 1f506fde97d0..3a1618580ed6 100644
--- a/trunk/drivers/media/usb/pwc/pwc-ctrl.c
+++ b/trunk/drivers/media/usb/pwc/pwc-ctrl.c
@@ -179,6 +179,8 @@ static int set_video_mode_Nala(struct pwc_device *pdev, int size, int pixfmt,
 		return -EINVAL;
 	if (frames < 4)
 		frames = 4;
+	else if (size > PSZ_QCIF && frames > 15)
+		frames = 15;
 	else if (frames > 25)
 		frames = 25;
 	frames = frames2frames[frames];