diff options
| author |   Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-02-21 17:07:14 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-02-21 17:07:14 +0100 |
| commit | e29371d762df5bb35d2bc434ea266a046e5a0a75 (patch) | |
| tree | dac4a8db52d92453415f35606130a49e9f32e4ef /drivers/media/usb/pwc/pwc-ctrl.c | |
| parent | netfilter: ipset: Fix range bug in hash:ip,port,net (diff) | |
| parent | netfilter: nf_ct_reasm: fix per-netns sysctl initialization (diff) | |
| download | linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.tar.xz linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'drivers/media/usb/pwc/pwc-ctrl.c')
| -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, 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]; |