hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] struct path: convert v4l 

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Josef Sipek 2006-12-08 02:37:47 -08:00 committed by Linus Torvalds
parent 33cb899400
commit 723731b2ee
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/compat_ioctl32.c
View File

@ -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); ret = file->f_op->unlocked_ioctl(file, cmd, arg);
else if (file->f_op->ioctl) { else if (file->f_op->ioctl) {
lock_kernel(); 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(); unlock_kernel();
} }

2
drivers/media/video/videodev.c
View File

@ -105,7 +105,7 @@ static DEFINE_MUTEX(videodev_lock);
struct video_device* video_devdata(struct file *file) struct video_device* video_devdata(struct file *file)
{ {
return video_device[iminor(file->f_dentry->d_inode)]; return video_device[iminor(file->f_path.dentry->d_inode)];
} }
/* /*

4
drivers/media/video/zoran_procfs.c
View File

@ -144,7 +144,7 @@ static int zoran_open(struct inode *inode, struct file *file)
static ssize_t zoran_write(struct file *file, const char __user *buffer, static ssize_t zoran_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct zoran *zr = PDE(file->f_dentry->d_inode)->data; struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
char *string, *sp; char *string, *sp;
char *line, *ldelim, *varname, *svar, *tdelim; char *line, *ldelim, *varname, *svar, *tdelim;
@ -165,7 +165,7 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer,
} }
string[count] = 0; string[count] = 0;
dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n", dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n",
ZR_DEVNAME(zr), file->f_dentry->d_name.name, count, zr); ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr);
ldelim = " \t\n"; ldelim = " \t\n";
tdelim = "="; tdelim = "=";
line = strpbrk(sp, ldelim); line = strpbrk(sp, ldelim);