diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-09-03 15:46:50 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:36:23 -0400 |
| commit | 888fe747b5d134e2f3b5c2d3ecc25e1c6dcad4c3 (patch) | |
| tree | a8991a467976d0f55a8534660aa541ac527dd39b | |
| parent | e908b6e34c1b799c830cae5f8e721f80534f9748 (diff) | |
V4L/DVB (8629): v4l2-ioctl: do not try to handle private V4L1 ioctls
Some drivers (e.g. zoran) have private V4L1 ioctls. Do not try to
pass them to v4l1_compat_translate because then the driver will
never see them.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index fdfe7739c96e..88c0465aede4 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
| @@ -674,7 +674,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
| 674 | __video_do_ioctl will be called again, with one or more | 674 | __video_do_ioctl will be called again, with one or more |
| 675 | V4L2 ioctls. | 675 | V4L2 ioctls. |
| 676 | ********************************************************/ | 676 | ********************************************************/ |
| 677 | if (_IOC_TYPE(cmd) == 'v') | 677 | if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE) |
| 678 | return v4l_compat_translate_ioctl(inode, file, cmd, arg, | 678 | return v4l_compat_translate_ioctl(inode, file, cmd, arg, |
| 679 | __video_do_ioctl); | 679 | __video_do_ioctl); |
| 680 | #endif | 680 | #endif |