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

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

[PATCH] struct path: convert video 



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 723731b2

drivers/video/arcfb.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou 
	unsigned int xres;



	p = *ppos;

	inode = file->f_dentry->d_inode;

	inode = file->f_path.dentry->d_inode;

	fbidx = iminor(inode);

	info = registered_fb[fbidx];

drivers/video/epson1355fb.c

+2 −2
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static inline unsigned long copy_to_user16(void *to, const void *from, 
static ssize_t

epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int fbidx = iminor(inode);

	struct fb_info *info = registered_fb[fbidx];

	unsigned long p = *ppos;
@@ -437,7 +437,7 @@ static ssize_t 
epson1355fb_write(struct file *file, const char *buf,

		  size_t count, loff_t * ppos)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int fbidx = iminor(inode);

	struct fb_info *info = registered_fb[fbidx];

	unsigned long p = *ppos;

drivers/video/fbmem.c

+4 −4
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static ssize_t 
fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)

{

	unsigned long p = *ppos;

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int fbidx = iminor(inode);

	struct fb_info *info = registered_fb[fbidx];

	u32 *buffer, *dst;
@@ -647,7 +647,7 @@ static ssize_t 
fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)

{

	unsigned long p = *ppos;

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int fbidx = iminor(inode);

	struct fb_info *info = registered_fb[fbidx];

	u32 *buffer, *src;
@@ -1081,7 +1081,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file, 
static long

fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int fbidx = iminor(inode);

	struct fb_info *info = registered_fb[fbidx];

	struct fb_ops *fb = info->fbops;
@@ -1121,7 +1121,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
static int 

fb_mmap(struct file *file, struct vm_area_struct * vma)

{

	int fbidx = iminor(file->f_dentry->d_inode);

	int fbidx = iminor(file->f_path.dentry->d_inode);

	struct fb_info *info = registered_fb[fbidx];

	struct fb_ops *fb = info->fbops;

	unsigned long off;