diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-19 11:22:19 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-19 11:22:19 +0100 |
| commit | c1687736b4c359f8963683698ad5cf33e6d7780e (patch) | |
| tree | b062c72c9853bcca3f4849647519cb5a0a82caee /linux/drivers/media/video/v4l2-compat-ioctl32.c | |
| parent | eebdebc91edbad9e91a7ac0b8762b12fd4160b0b (diff) | |
| parent | c4542dc81f4ce29264cfdf0ac973a51129685567 (diff) | |
| download | mediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.gz mediapointer-dvb-s2-c1687736b4c359f8963683698ad5cf33e6d7780e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/v4l2-compat-ioctl32.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-compat-ioctl32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-compat-ioctl32.c b/linux/drivers/media/video/v4l2-compat-ioctl32.c index 09d5c5693..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) { @@ -977,6 +977,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) #endif default: v4l_print_ioctl("compat_ioctl32", cmd); + printk(KERN_CONT "\n"); + break; } return ret; } |