aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/compat_ioctl32.c2
-rw-r--r--drivers/media/video/videodev.c2
-rw-r--r--drivers/media/video/zoran_procfs.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index d82a488f12a6..f065ad12cc61 100644
--- 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)
118 ret = file->f_op->unlocked_ioctl(file, cmd, arg); 118 ret = file->f_op->unlocked_ioctl(file, cmd, arg);
119 else if (file->f_op->ioctl) { 119 else if (file->f_op->ioctl) {
120 lock_kernel(); 120 lock_kernel();
121 ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg); 121 ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
122 unlock_kernel(); 122 unlock_kernel();
123 } 123 }
124 124
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index d424a4129d69..41ec0c4b35a2 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -105,7 +105,7 @@ static DEFINE_MUTEX(videodev_lock);
105 105
106struct video_device* video_devdata(struct file *file) 106struct video_device* video_devdata(struct file *file)
107{ 107{
108 return video_device[iminor(file->f_dentry->d_inode)]; 108 return video_device[iminor(file->f_path.dentry->d_inode)];
109} 109}
110 110
111/* 111/*
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c
index c7f6f6488360..c374c76b3753 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran_procfs.c
@@ -144,7 +144,7 @@ static int zoran_open(struct inode *inode, struct file *file)
144static ssize_t zoran_write(struct file *file, const char __user *buffer, 144static ssize_t zoran_write(struct file *file, const char __user *buffer,
145 size_t count, loff_t *ppos) 145 size_t count, loff_t *ppos)
146{ 146{
147 struct zoran *zr = PDE(file->f_dentry->d_inode)->data; 147 struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
148 char *string, *sp; 148 char *string, *sp;
149 char *line, *ldelim, *varname, *svar, *tdelim; 149 char *line, *ldelim, *varname, *svar, *tdelim;
150 150
@@ -165,7 +165,7 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer,
165 } 165 }
166 string[count] = 0; 166 string[count] = 0;
167 dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n", 167 dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n",
168 ZR_DEVNAME(zr), file->f_dentry->d_name.name, count, zr); 168 ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr);
169 ldelim = " \t\n"; 169 ldelim = " \t\n";
170 tdelim = "="; 170 tdelim = "=";
171 line = strpbrk(sp, ldelim); 171 line = strpbrk(sp, ldelim);