aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-28 21:25:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:45 -0400
commit020b882b1d34e8787658a15e00f2ea0d4651605b (patch)
tree5ea1df2b705b6e50221e986f4e3c57831edeb0d3
parent5a27578667b3bd00cab909296824498bdbd732d5 (diff)
V4L/DVB (11264): omap24xxcam: Remove buffer type check from vidioc_s/g_parm
The v4l2-ioctl core now only allows buffer types for which the corresponding ->vidioc_try_fmt_xxx() methods are defined to be used in vidioc_(g|s)_parm. This driver only defines ->vidioc_try_fmt_vid_cap() so only VIDEO_CAPTURE buffers are allowed to be used with vidioc_s_parm() and vidioc_g_parm(). Cc: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/omap24xxcam.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 2cea7fee9b51..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;