Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 723731b2 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert v4l 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33cb8994

drivers/media/video/compat_ioctl32.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	else if (file->f_op->ioctl) {

		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();

	}

drivers/media/video/videodev.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static DEFINE_MUTEX(videodev_lock); 


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)];

}



/*

drivers/media/video/zoran_procfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

			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 *line, *ldelim, *varname, *svar, *tdelim;
@@ -165,7 +165,7 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer, 
	}

	string[count] = 0;

	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";

	tdelim = "=";

	line = strpbrk(sp, ldelim);