aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:29 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:48 -0500
commit40fad04b224db982cce5f6226ebe3ceb6529b781 (patch)
tree06e15a49d29d1d4d03fc6902aad9d7e8aa1f3992 /drivers
parent46cc65a767f458aec4d342b814a661a15dc31be1 (diff)
[PATCH] struct path: convert pcmcia
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')
-rw-r--r--drivers/pcmcia/pcmcia_ioctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index d077870c6731..327372b7a54e 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -486,7 +486,7 @@ static ssize_t ds_read(struct file *file, char __user *buf,
486 user_info_t *user; 486 user_info_t *user;
487 int ret; 487 int ret;
488 488
489 ds_dbg(2, "ds_read(socket %d)\n", iminor(file->f_dentry->d_inode)); 489 ds_dbg(2, "ds_read(socket %d)\n", iminor(file->f_path.dentry->d_inode));
490 490
491 if (count < 4) 491 if (count < 4)
492 return -EINVAL; 492 return -EINVAL;
@@ -511,7 +511,7 @@ static ssize_t ds_read(struct file *file, char __user *buf,
511static ssize_t ds_write(struct file *file, const char __user *buf, 511static ssize_t ds_write(struct file *file, const char __user *buf,
512 size_t count, loff_t *ppos) 512 size_t count, loff_t *ppos)
513{ 513{
514 ds_dbg(2, "ds_write(socket %d)\n", iminor(file->f_dentry->d_inode)); 514 ds_dbg(2, "ds_write(socket %d)\n", iminor(file->f_path.dentry->d_inode));
515 515
516 if (count != 4) 516 if (count != 4)
517 return -EINVAL; 517 return -EINVAL;
@@ -529,7 +529,7 @@ static u_int ds_poll(struct file *file, poll_table *wait)
529 struct pcmcia_socket *s; 529 struct pcmcia_socket *s;
530 user_info_t *user; 530 user_info_t *user;
531 531
532 ds_dbg(2, "ds_poll(socket %d)\n", iminor(file->f_dentry->d_inode)); 532 ds_dbg(2, "ds_poll(socket %d)\n", iminor(file->f_path.dentry->d_inode));
533 533
534 user = file->private_data; 534 user = file->private_data;
535 if (CHECK_USER(user)) 535 if (CHECK_USER(user))