Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[platform/kernel/linux-rpi.git] / arch / mips / kernel / vpe.c

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index b4c0152..1765bab 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1140,7 +1140,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
        size_t ret = count;
        struct vpe *v;
 
-       if (iminor(file->f_path.dentry->d_inode) != minor)
+       if (iminor(file_inode(file)) != minor)
                return -ENODEV;
 
        v = get_vpe(tclimit);