summaryrefslogtreecommitdiff
path: root/drivers/media/usb/pwc
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-10-08 13:05:24 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-21 19:05:57 +0400
commitbb969707f99e12f7fbb21b261b33de16e3e4b31e (patch)
tree26c2baea77872219616c9c462f592dc043ee16fd /drivers/media/usb/pwc
parent2b34e9d1beb546afd7586845775f2d1272a08a4a (diff)
downloadlinux-bb969707f99e12f7fbb21b261b33de16e3e4b31e.tar.xz
[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>
Diffstat (limited to 'drivers/media/usb/pwc')
-rw-r--r--drivers/media/usb/pwc/pwc-ctrl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/pwc/pwc-ctrl.c b/drivers/media/usb/pwc/pwc-ctrl.c
index 1f506fde97d0..3a1618580ed6 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];