Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 138357
b: refs/heads/master
c: 2509e1c
h: refs/heads/master
i:
  138355: 97b7779
v: v3
  • Loading branch information
Trent Piepho authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent db7b5d5 commit 4f4c646
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 020b882b1d34e8787658a15e00f2ea0d4651605b
refs/heads/master: 2509e1cb3360961113117f25ae482c430f3bd03d
10 changes: 1 addition & 9 deletions trunk/drivers/media/video/stk-webcam.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,8 +1112,6 @@ static int stk_vidioc_reqbufs(struct file *filp,

if (dev == NULL)
return -ENODEV;
if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
if (rb->memory != V4L2_MEMORY_MMAP)
return -EINVAL;
if (is_streaming(dev)
Expand Down Expand Up @@ -1152,8 +1150,6 @@ static int stk_vidioc_qbuf(struct file *filp,
struct stk_camera *dev = priv;
struct stk_sio_buffer *sbuf;
unsigned long flags;
if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;

if (buf->memory != V4L2_MEMORY_MMAP)
return -EINVAL;
Expand All @@ -1180,8 +1176,7 @@ static int stk_vidioc_dqbuf(struct file *filp,
unsigned long flags;
int ret;

if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
|| !is_streaming(dev))
if (!is_streaming(dev))
return -EINVAL;

if (filp->f_flags & O_NONBLOCK && list_empty(&dev->sio_full))
Expand Down Expand Up @@ -1240,9 +1235,6 @@ static int stk_vidioc_streamoff(struct file *filp,
static int stk_vidioc_g_parm(struct file *filp,
void *priv, struct v4l2_streamparm *sp)
{
if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;

/*FIXME This is not correct */
sp->parm.capture.timeperframe.numerator = 1;
sp->parm.capture.timeperframe.denominator = 30;
Expand Down

0 comments on commit 4f4c646

Please sign in to comment.