From: Hans Verkuil Date: Tue, 16 Dec 2008 11:32:37 +0000 (-0300) Subject: V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well. X-Git-Tag: v2.6.28~1^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19;p=linux-2.6-omap-h63xx.git V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well. The v4l_compat_ioctl32() function only tested for the presence of the ioctl op, not for unlocked_ioctl. So it would always return an error when used with drivers that use unlocked_ioctl instead of ioctl. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index e6ca4012b5f..0ea85a05e5c 100644 --- a/drivers/media/video/compat_ioctl32.c +++ b/drivers/media/video/compat_ioctl32.c @@ -831,7 +831,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; - if (!file->f_op->ioctl) + if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl) return ret; switch (cmd) {