Merge tag 'for-linus-v3.11-rc1' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / char / sonypi.c

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 6386a98e43c1b153242254a8c1f4a125daf7a2ad..bf2349dbbf7ffd301839bf24242b9fd2127b53db 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -938,7 +938,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
        }
 
        if (ret > 0) {
-               struct inode *inode = file->f_path.dentry->d_inode;
+               struct inode *inode = file_inode(file);
                inode->i_atime = current_fs_time(inode->i_sb);
        }