Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / compat_ioctl32.c

diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index d82a488f12a6a5214ff15bdea70a6b4fdde51102..f065ad12cc6119c3ca69db39d74e74ff827a612d 100644 (file)
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -118,7 +118,7 @@ static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                ret = file->f_op->unlocked_ioctl(file, cmd, arg);
        else if (file->f_op->ioctl) {
                lock_kernel();
-               ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg);
+               ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
                unlock_kernel();
        }