diff options
| author |   Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 02:36:55 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:28:44 -0800 |
| commit | a7113a966241b700aecc7b8cb326cecb62e3c4b2 (patch) | |
| tree | b28920a82e7cad67ea6e55826e161ba0e4cf9782 /drivers/char/lp.c | |
| parent | [PATCH] struct path: convert block_drivers (diff) | |
| download | linux-dev-a7113a966241b700aecc7b8cb326cecb62e3c4b2.tar.xz linux-dev-a7113a966241b700aecc7b8cb326cecb62e3c4b2.zip | |
[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.c | 4 |
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) static ssize_t lp_write(struct file * file, const char __user * buf, size_t count, loff_t *ppos) { - unsigned int minor = iminor(file->f_dentry->d_inode); + unsigned int minor = iminor(file->f_path.dentry->d_inode); struct parport *port = lp_table[minor].dev->port; char *kbuf = lp_table[minor].lp_buffer; ssize_t retv = 0; @@ -415,7 +415,7 @@ static ssize_t lp_read(struct file * file, char __user * buf, size_t count, loff_t *ppos) { DEFINE_WAIT(wait); - unsigned int minor=iminor(file->f_dentry->d_inode); + unsigned int minor=iminor(file->f_path.dentry->d_inode); struct parport *port = lp_table[minor].dev->port; ssize_t retval = 0; char *kbuf = lp_table[minor].lp_buffer; |