Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 343932
b: refs/heads/master
c: 9001a4b
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Mauro Carvalho Chehab committed Nov 21, 2012
1 parent aa36629 commit b827e7f
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: 6c058fb66e66bab8a0725753dd58f5c140af07f2
refs/heads/master: 9001a4bbde2f7566d47519915ee71d45dfad4a02
2 changes: 2 additions & 0 deletions trunk/drivers/media/usb/sn9c102/sn9c102_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2481,11 +2481,13 @@ sn9c102_vidioc_enum_framesizes(struct sn9c102_device* cam, void __user * arg)
if (frmsize.pixel_format != V4L2_PIX_FMT_SN9C10X &&
frmsize.pixel_format != V4L2_PIX_FMT_SBGGR8)
return -EINVAL;
break;
case BRIDGE_SN9C105:
case BRIDGE_SN9C120:
if (frmsize.pixel_format != V4L2_PIX_FMT_JPEG &&
frmsize.pixel_format != V4L2_PIX_FMT_SBGGR8)
return -EINVAL;
break;
}

frmsize.type = V4L2_FRMSIZE_TYPE_STEPWISE;
Expand Down

0 comments on commit b827e7f

Please sign in to comment.