diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-16 08:32:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-16 16:43:59 -0200 |
| commit | 3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19 (patch) | |
| tree | 9f95669e5569d7b26df4c20a35d387403fdcbc5d | |
| parent | 8b21c1e90e633aee3363e3d87e1a0b829bdb420e (diff) | |
| download | linux-3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19.tar.bz2 | |
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 <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/compat_ioctl32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index e6ca4012b5f0..0ea85a05e5c0 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) { |