Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343905
b: refs/heads/master
c: bb96970
h: refs/heads/master
i:
  343903: c01559b
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Nov 21, 2012
1 parent 55a4900 commit ca30a5e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b34e9d1beb546afd7586845775f2d1272a08a4a
refs/heads/master: bb969707f99e12f7fbb21b261b33de16e3e4b31e
2 changes: 2 additions & 0 deletions trunk/drivers/media/usb/pwc/pwc-ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit ca30a5e

Please sign in to comment.