aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/lp.c
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:36:55 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:44 -0500
commita7113a966241b700aecc7b8cb326cecb62e3c4b2 (patch)
treeb28920a82e7cad67ea6e55826e161ba0e4cf9782 /drivers/char/lp.c
parent6c648be6f4183775679c1f2cc4d094128f104fb2 (diff)
[PATCH] struct path: convert char-drivers
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/char/lp.c')
-rw-r--r--drivers/char/lp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 1ecea7d448f1..b70b5388b5a8 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -296,7 +296,7 @@ static int lp_wait_ready(int minor, int nonblock)
296static ssize_t lp_write(struct file * file, const char __user * buf, 296static ssize_t lp_write(struct file * file, const char __user * buf,
297 size_t count, loff_t *ppos) 297 size_t count, loff_t *ppos)
298{ 298{
299 unsigned int minor = iminor(file->f_dentry->d_inode); 299 unsigned int minor = iminor(file->f_path.dentry->d_inode);
300 struct parport *port = lp_table[minor].dev->port; 300 struct parport *port = lp_table[minor].dev->port;
301 char *kbuf = lp_table[minor].lp_buffer; 301 char *kbuf = lp_table[minor].lp_buffer;
302 ssize_t retv = 0; 302 ssize_t retv = 0;
@@ -415,7 +415,7 @@ static ssize_t lp_read(struct file * file, char __user * buf,
415 size_t count, loff_t *ppos) 415 size_t count, loff_t *ppos)
416{ 416{
417 DEFINE_WAIT(wait); 417 DEFINE_WAIT(wait);
418 unsigned int minor=iminor(file->f_dentry->d_inode); 418 unsigned int minor=iminor(file->f_path.dentry->d_inode);
419 struct parport *port = lp_table[minor].dev->port; 419 struct parport *port = lp_table[minor].dev->port;
420 ssize_t retval = 0; 420 ssize_t retval = 0;
421 char *kbuf = lp_table[minor].lp_buffer; 421 char *kbuf = lp_table[minor].lp_buffer;