|
@@ -567,8 +567,6 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
|
set_bit(_IOC_NR(VIDIOC_G_PRIORITY), valid_ioctls);
|
|
set_bit(_IOC_NR(VIDIOC_G_PRIORITY), valid_ioctls);
|
|
if (ops->vidioc_s_priority)
|
|
if (ops->vidioc_s_priority)
|
|
set_bit(_IOC_NR(VIDIOC_S_PRIORITY), valid_ioctls);
|
|
set_bit(_IOC_NR(VIDIOC_S_PRIORITY), valid_ioctls);
|
|
- SET_VALID_IOCTL(ops, VIDIOC_STREAMON, vidioc_streamon);
|
|
|
|
- SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
|
|
|
|
/* Note: the control handler can also be passed through the filehandle,
|
|
/* Note: the control handler can also be passed through the filehandle,
|
|
and that can't be tested here. If the bit for these control ioctls
|
|
and that can't be tested here. If the bit for these control ioctls
|
|
is set, then the ioctl is valid. But if it is 0, then it can still
|
|
is set, then the ioctl is valid. But if it is 0, then it can still
|
|
@@ -684,6 +682,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
|
SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
|
|
SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
|
|
SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
|
|
SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
|
|
SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
|
|
SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
|
|
|
|
+ SET_VALID_IOCTL(ops, VIDIOC_STREAMON, vidioc_streamon);
|
|
|
|
+ SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
|
|
}
|
|
}
|
|
|
|
|
|
if (is_vid || is_vbi) {
|
|
if (is_vid || is_vbi) {
|