diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-02-07 11:39:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-04 12:00:28 -0500 |
commit | 1fe184a6accc781e814f15342513794266d73d06 (patch) | |
tree | 23a7809633a32cdb383d9fe86aeccf1246b42647 | |
parent | 83c8bcce0629239ff9de6625ea74e16a10e8c1f0 (diff) |
[media] em28xx: make ioctls VIDIOC_G/S_PARM working for VBI devices
With the current code V4L2_BUF_TYPE_VIDEO_CAPTURE is accepted only, but for VBI
devices only buffer type V4L2_BUF_TYPE_VBI_CAPTURE is used/valid.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index c1f6c59f53aa..e13b777d2cbf 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -1024,9 +1024,6 @@ static int vidioc_g_parm(struct file *file, void *priv, | |||
1024 | struct em28xx *dev = fh->dev; | 1024 | struct em28xx *dev = fh->dev; |
1025 | int rc = 0; | 1025 | int rc = 0; |
1026 | 1026 | ||
1027 | if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1028 | return -EINVAL; | ||
1029 | |||
1030 | p->parm.capture.readbuffers = EM28XX_MIN_BUF; | 1027 | p->parm.capture.readbuffers = EM28XX_MIN_BUF; |
1031 | if (dev->board.is_webcam) | 1028 | if (dev->board.is_webcam) |
1032 | rc = v4l2_device_call_until_err(&dev->v4l2_dev, 0, | 1029 | rc = v4l2_device_call_until_err(&dev->v4l2_dev, 0, |
@@ -1044,9 +1041,6 @@ static int vidioc_s_parm(struct file *file, void *priv, | |||
1044 | struct em28xx_fh *fh = priv; | 1041 | struct em28xx_fh *fh = priv; |
1045 | struct em28xx *dev = fh->dev; | 1042 | struct em28xx *dev = fh->dev; |
1046 | 1043 | ||
1047 | if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
1048 | return -EINVAL; | ||
1049 | |||
1050 | p->parm.capture.readbuffers = EM28XX_MIN_BUF; | 1044 | p->parm.capture.readbuffers = EM28XX_MIN_BUF; |
1051 | return v4l2_device_call_until_err(&dev->v4l2_dev, 0, video, s_parm, p); | 1045 | return v4l2_device_call_until_err(&dev->v4l2_dev, 0, video, s_parm, p); |
1052 | } | 1046 | } |