From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 8 Oct 2012 09:05:24 +0000 (-0300)
Subject: [media] pwc: Fix codec1 cameras no longer working
X-Git-Tag: v3.9-rc5~2^2~717
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb969707f99e12f7fbb21b261b33de16e3e4b31e;p=platform%2Fkernel%2Flinux-stable.git

[media] pwc: Fix codec1 cameras no longer working

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/usb/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c
index 1f506fd..3a16185 100644
--- a/drivers/media/usb/pwc/pwc-ctrl.c
+++ b/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];