projects
/
h-e-n
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[h-e-n]
/
drivers
/
media
/
video
/
compat_ioctl32.c
diff --git
a/drivers/media/video/compat_ioctl32.c
b/drivers/media/video/compat_ioctl32.c
index
e6ca401
..
0ea85a0
100644
(file)
--- 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) {