diff options
Diffstat (limited to 'drivers/media/video/omap24xxcam.c')
-rw-r--r-- | drivers/media/video/omap24xxcam.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 805faaea6449..5fc4ac0d88f0 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
@@ -1285,9 +1285,6 @@ static int vidioc_g_parm(struct file *file, void *fh, | |||
1285 | struct omap24xxcam_device *cam = ofh->cam; | 1285 | struct omap24xxcam_device *cam = ofh->cam; |
1286 | int rval; | 1286 | int rval; |
1287 | 1287 | ||
1288 | if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1289 | return -EINVAL; | ||
1290 | |||
1291 | mutex_lock(&cam->mutex); | 1288 | mutex_lock(&cam->mutex); |
1292 | rval = vidioc_int_g_parm(cam->sdev, a); | 1289 | rval = vidioc_int_g_parm(cam->sdev, a); |
1293 | mutex_unlock(&cam->mutex); | 1290 | mutex_unlock(&cam->mutex); |
@@ -1303,9 +1300,6 @@ static int vidioc_s_parm(struct file *file, void *fh, | |||
1303 | struct v4l2_streamparm old_streamparm; | 1300 | struct v4l2_streamparm old_streamparm; |
1304 | int rval; | 1301 | int rval; |
1305 | 1302 | ||
1306 | if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1307 | return -EINVAL; | ||
1308 | |||
1309 | mutex_lock(&cam->mutex); | 1303 | mutex_lock(&cam->mutex); |
1310 | if (cam->streaming) { | 1304 | if (cam->streaming) { |
1311 | rval = -EBUSY; | 1305 | rval = -EBUSY; |
@@ -1665,7 +1659,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s) | |||
1665 | vfd->parent = cam->dev; | 1659 | vfd->parent = cam->dev; |
1666 | 1660 | ||
1667 | strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name)); | 1661 | strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name)); |
1668 | vfd->vfl_type = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY; | ||
1669 | vfd->fops = &omap24xxcam_fops; | 1662 | vfd->fops = &omap24xxcam_fops; |
1670 | vfd->minor = -1; | 1663 | vfd->minor = -1; |
1671 | vfd->ioctl_ops = &omap24xxcam_ioctl_fops; | 1664 | vfd->ioctl_ops = &omap24xxcam_ioctl_fops; |