]> err.no Git - linux-2.6/commitdiff
V4L/DVB (8629): v4l2-ioctl: do not try to handle private V4L1 ioctls
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 3 Sep 2008 19:46:50 +0000 (16:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 3 Sep 2008 21:36:23 +0000 (18:36 -0300)
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>
drivers/media/video/v4l2-ioctl.c

index fdfe7739c96ed929dd56941ce617c8d352d38600..88c0465aede450dae12eba85cfa4a088d50be26a 100644 (file)
@@ -674,7 +674,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
         __video_do_ioctl will be called again, with one or more
         V4L2 ioctls.
         ********************************************************/
-       if (_IOC_TYPE(cmd) == 'v')
+       if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE)
                return v4l_compat_translate_ioctl(inode, file, cmd, arg,
                                                __video_do_ioctl);
 #endif