Skip to content

Commit

Permalink
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
Browse files Browse the repository at this point in the history
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 <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Dec 16, 2008
1 parent 8b21c1e commit 3ca81a5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/media/video/compat_ioctl32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 3ca81a5

Please sign in to comment.