V4L/DVB (9990): gspca - main: Remove useless tests of the buffer type.
The buffer type is already checked in v4l2-ioctl. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
f8a04a6fc4
commit
13752bd9c9
1 changed files with 1 additions and 12 deletions
|
@ -775,8 +775,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
|
|||
struct gspca_dev *gspca_dev = priv;
|
||||
int mode;
|
||||
|
||||
if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
mode = gspca_dev->curr_mode;
|
||||
memcpy(&fmt->fmt.pix, &gspca_dev->cam.cam_mode[mode],
|
||||
sizeof fmt->fmt.pix);
|
||||
|
@ -788,8 +786,6 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
|
|||
{
|
||||
int w, h, mode, mode2;
|
||||
|
||||
if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
w = fmt->fmt.pix.width;
|
||||
h = fmt->fmt.pix.height;
|
||||
|
||||
|
@ -1143,8 +1139,6 @@ static int vidioc_reqbufs(struct file *file, void *priv,
|
|||
struct gspca_dev *gspca_dev = priv;
|
||||
int i, ret = 0;
|
||||
|
||||
if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
switch (rb->memory) {
|
||||
case GSPCA_MEMORY_READ: /* (internal call) */
|
||||
case V4L2_MEMORY_MMAP:
|
||||
|
@ -1209,8 +1203,7 @@ static int vidioc_querybuf(struct file *file, void *priv,
|
|||
struct gspca_dev *gspca_dev = priv;
|
||||
struct gspca_frame *frame;
|
||||
|
||||
if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
|
||||
|| v4l2_buf->index < 0
|
||||
if (v4l2_buf->index < 0
|
||||
|| v4l2_buf->index >= gspca_dev->nframes)
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -1551,8 +1544,6 @@ static int vidioc_dqbuf(struct file *file, void *priv,
|
|||
int i, ret;
|
||||
|
||||
PDEBUG(D_FRAM, "dqbuf");
|
||||
if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
if (v4l2_buf->memory != gspca_dev->memory)
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -1607,8 +1598,6 @@ static int vidioc_qbuf(struct file *file, void *priv,
|
|||
int i, index, ret;
|
||||
|
||||
PDEBUG(D_FRAM, "qbuf %d", v4l2_buf->index);
|
||||
if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
|
||||
return -EINVAL;
|
||||
|
||||
if (mutex_lock_interruptible(&gspca_dev->queue_lock))
|
||||
return -ERESTARTSYS;
|
||||
|
|
Loading…
Reference in a new issue