diff options
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 6 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 |
2 files changed, 4 insertions, 4 deletions
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); |