diff options
| -rw-r--r-- | linux/drivers/media/video/compat_ioctl32.c | 10 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c index e63c977da..fe1bb13f8 100644 --- a/linux/drivers/media/video/compat_ioctl32.c +++ b/linux/drivers/media/video/compat_ioctl32.c @@ -96,11 +96,11 @@ static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; - if (file->f_ops->unlocked_ioctl) - ret = file->f_ops->unlocked_ioctl(file, cmd, arg); - else if (file->f_ops->ioctl) { + if (file->f_op->unlocked_ioctl) + ret = file->f_op->unlocked_ioctl(file, cmd, arg); + else if (file->f_op->ioctl) { lock_kernel(); - ret = file->f_ops->ioctl(file->f_dentry->d_inode, file, cmd, arg); + ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg); unlock_kernel(); } @@ -262,7 +262,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) { int ret = -ENOIOCTLCMD; - if (!file->f_ops->ioctl) + if (!file->f_op->ioctl) return ret; switch (cmd) { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2bb493064..d1d885b8a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-11-10 20:41 nshmyrev + + * ../linux/drivers/media/video/compat_ioctl32.c: (native_ioctl): + + Use f_op field of struct file instead of strange f_ops. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-11-10 19:30 mchehab * ../linux/drivers/media/video/cx25840/cx25840-core.c: |