diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-10 20:43:26 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-10 20:43:26 +0000 |
| commit | 6bb171a4e58ec68e267799d0ccd6223126e4a04a (patch) | |
| tree | 33ffd83f6e07f44eec10b4ed6e6e613b05b446e5 /linux/drivers/media | |
| parent | eaec8746a98988c0b6060212dc6623df36104d7f (diff) | |
| download | mediapointer-dvb-s2-6bb171a4e58ec68e267799d0ccd6223126e4a04a.tar.gz mediapointer-dvb-s2-6bb171a4e58ec68e267799d0ccd6223126e4a04a.tar.bz2 | |
Use f_op field of struct file instead of strange f_ops.
From: Axel Thimm <Axel.Thimm@ATrpms.net>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/compat_ioctl32.c | 10 |
1 files changed, 5 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) { |