diff options
-rw-r--r-- | drivers/isdn/capi/capi.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hysdn_proclog.c | 4 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 6 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 11844bbfe933..787a630a8e56 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
@@ -1010,7 +1010,7 @@ static int capinc_tty_open(struct tty_struct * tty, struct file * file) | |||
1010 | { | 1010 | { |
1011 | struct capiminor *mp; | 1011 | struct capiminor *mp; |
1012 | 1012 | ||
1013 | if ((mp = capiminor_find(iminor(file->f_dentry->d_inode))) == 0) | 1013 | if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == 0) |
1014 | return -ENXIO; | 1014 | return -ENXIO; |
1015 | if (mp->nccip == 0) | 1015 | if (mp->nccip == 0) |
1016 | return -ENXIO; | 1016 | return -ENXIO; |
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c index fcd49920b220..4d238eff1773 100644 --- a/drivers/isdn/hysdn/hysdn_proclog.c +++ b/drivers/isdn/hysdn/hysdn_proclog.c | |||
@@ -204,7 +204,7 @@ hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t * off) | |||
204 | { | 204 | { |
205 | struct log_data *inf; | 205 | struct log_data *inf; |
206 | int len; | 206 | int len; |
207 | struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode); | 207 | struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode); |
208 | struct procdata *pd = NULL; | 208 | struct procdata *pd = NULL; |
209 | hysdn_card *card; | 209 | hysdn_card *card; |
210 | 210 | ||
@@ -354,7 +354,7 @@ static unsigned int | |||
354 | hysdn_log_poll(struct file *file, poll_table * wait) | 354 | hysdn_log_poll(struct file *file, poll_table * wait) |
355 | { | 355 | { |
356 | unsigned int mask = 0; | 356 | unsigned int mask = 0; |
357 | struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode); | 357 | struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode); |
358 | hysdn_card *card; | 358 | hysdn_card *card; |
359 | struct procdata *pd = NULL; | 359 | struct procdata *pd = NULL; |
360 | 360 | ||
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 69aee2602aa6..a610a05aa217 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -1059,7 +1059,7 @@ isdn_info_update(void) | |||
1059 | static ssize_t | 1059 | static ssize_t |
1060 | isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off) | 1060 | isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off) |
1061 | { | 1061 | { |
1062 | uint minor = iminor(file->f_dentry->d_inode); | 1062 | uint minor = iminor(file->f_path.dentry->d_inode); |
1063 | int len = 0; | 1063 | int len = 0; |
1064 | int drvidx; | 1064 | int drvidx; |
1065 | int chidx; | 1065 | int chidx; |
@@ -1166,7 +1166,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off) | |||
1166 | static ssize_t | 1166 | static ssize_t |
1167 | isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off) | 1167 | isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off) |
1168 | { | 1168 | { |
1169 | uint minor = iminor(file->f_dentry->d_inode); | 1169 | uint minor = iminor(file->f_path.dentry->d_inode); |
1170 | int drvidx; | 1170 | int drvidx; |
1171 | int chidx; | 1171 | int chidx; |
1172 | int retval; | 1172 | int retval; |
@@ -1228,7 +1228,7 @@ static unsigned int | |||
1228 | isdn_poll(struct file *file, poll_table * wait) | 1228 | isdn_poll(struct file *file, poll_table * wait) |
1229 | { | 1229 | { |
1230 | unsigned int mask = 0; | 1230 | unsigned int mask = 0; |
1231 | unsigned int minor = iminor(file->f_dentry->d_inode); | 1231 | unsigned int minor = iminor(file->f_path.dentry->d_inode); |
1232 | int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); | 1232 | int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); |
1233 | 1233 | ||
1234 | lock_kernel(); | 1234 | lock_kernel(); |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 119412d6bd15..175199088bf4 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -667,7 +667,7 @@ isdn_ppp_poll(struct file *file, poll_table * wait) | |||
667 | 667 | ||
668 | if (is->debug & 0x2) | 668 | if (is->debug & 0x2) |
669 | printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n", | 669 | printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n", |
670 | iminor(file->f_dentry->d_inode)); | 670 | iminor(file->f_path.dentry->d_inode)); |
671 | 671 | ||
672 | /* just registers wait_queue hook. This doesn't really wait. */ | 672 | /* just registers wait_queue hook. This doesn't really wait. */ |
673 | poll_wait(file, &is->wq, wait); | 673 | poll_wait(file, &is->wq, wait); |