Skip to content

Commit

Permalink
[PATCH] struct path: convert pcmcia
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Josef Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent 46cc65a commit 40fad04
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/pcmcia/pcmcia_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ static ssize_t ds_read(struct file *file, char __user *buf,
user_info_t *user;
int ret;

ds_dbg(2, "ds_read(socket %d)\n", iminor(file->f_dentry->d_inode));
ds_dbg(2, "ds_read(socket %d)\n", iminor(file->f_path.dentry->d_inode));

if (count < 4)
return -EINVAL;
Expand All @@ -511,7 +511,7 @@ static ssize_t ds_read(struct file *file, char __user *buf,
static ssize_t ds_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
ds_dbg(2, "ds_write(socket %d)\n", iminor(file->f_dentry->d_inode));
ds_dbg(2, "ds_write(socket %d)\n", iminor(file->f_path.dentry->d_inode));

if (count != 4)
return -EINVAL;
Expand All @@ -529,7 +529,7 @@ static u_int ds_poll(struct file *file, poll_table *wait)
struct pcmcia_socket *s;
user_info_t *user;

ds_dbg(2, "ds_poll(socket %d)\n", iminor(file->f_dentry->d_inode));
ds_dbg(2, "ds_poll(socket %d)\n", iminor(file->f_path.dentry->d_inode));

user = file->private_data;
if (CHECK_USER(user))
Expand Down

0 comments on commit 40fad04

Please sign in to comment.