diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:50 -0500 |
commit | 723731b2eef6599cf09af1fbfe0b12857b439e2d (patch) | |
tree | 967dbe38d2de0c8a490ed956d25ff3900abe23f3 /drivers/media/video/zoran_procfs.c | |
parent | 33cb89940082c54f348062db2f8bab6cf8fed816 (diff) |
[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>
Diffstat (limited to 'drivers/media/video/zoran_procfs.c')
-rw-r--r-- | drivers/media/video/zoran_procfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
144 | static ssize_t zoran_write(struct file *file, const char __user *buffer, | 144 | static 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); |