diff options
author | Hans de Goede <hdegoede@redhat.com> | 2012-10-08 05:05:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-21 10:05:57 -0500 |
commit | bb969707f99e12f7fbb21b261b33de16e3e4b31e (patch) | |
tree | 26c2baea77872219616c9c462f592dc043ee16fd /drivers/media/usb | |
parent | 2b34e9d1beb546afd7586845775f2d1272a08a4a (diff) |
[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')
-rw-r--r-- | drivers/media/usb/pwc/pwc-ctrl.c | 2 |
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, | |||
179 | return -EINVAL; | 179 | return -EINVAL; |
180 | if (frames < 4) | 180 | if (frames < 4) |
181 | frames = 4; | 181 | frames = 4; |
182 | else if (size > PSZ_QCIF && frames > 15) | ||
183 | frames = 15; | ||
182 | else if (frames > 25) | 184 | else if (frames > 25) |
183 | frames = 25; | 185 | frames = 25; |
184 | frames = frames2frames[frames]; | 186 | frames = frames2frames[frames]; |