diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-16 12:32:37 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-16 12:32:37 +0100 |
| commit | bd1a1f2bd484ed3eaa12def931e17c4444535ef8 (patch) | |
| tree | a7afb157833497c71e0ad9fe34a7a2d7f338aca0 /linux/drivers/media/video/v4l2-compat-ioctl32.c | |
| parent | f5435c98aa929cc30a19191341329ca7a6a91008 (diff) | |
| download | mediapointer-dvb-s2-bd1a1f2bd484ed3eaa12def931e17c4444535ef8.tar.gz mediapointer-dvb-s2-bd1a1f2bd484ed3eaa12def931e17c4444535ef8.tar.bz2 | |
v4l2-compat: test for unlocked_ioctl as well.
From: Hans Verkuil <hverkuil@xs4all.nl>
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.
Priority: high
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/v4l2-compat-ioctl32.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-compat-ioctl32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-compat-ioctl32.c b/linux/drivers/media/video/v4l2-compat-ioctl32.c index e2e7a2061..171f1ccd1 100644 --- a/linux/drivers/media/video/v4l2-compat-ioctl32.c +++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c @@ -887,7 +887,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) { |