Merge remote-tracking branch 'mac80211/master' into HEAD

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

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 54a3a6d09819922486f4de420f4ed0f96a6e7bb0..f3223aac4df11c41959a744bee67af2d2df232e5 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -80,7 +80,7 @@ static int raw_open(struct inode *inode, struct file *filp)
        filp->f_flags |= O_DIRECT;
        filp->f_mapping = bdev->bd_inode->i_mapping;
        if (++raw_devices[minor].inuse == 1)
-               filp->f_path.dentry->d_inode->i_mapping =
+               file_inode(filp)->i_mapping =
                        bdev->bd_inode->i_mapping;
        filp->private_data = bdev;
        mutex_unlock(&raw_mutex);