diff options
-rw-r--r-- | drivers/telephony/ixj.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 1b601b6cf2a2..df4cc1fb5f68 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -2747,7 +2747,7 @@ static void alaw2ulaw(unsigned char *buff, unsigned long len) | |||
2747 | static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos) | 2747 | static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos) |
2748 | { | 2748 | { |
2749 | unsigned long i = *ppos; | 2749 | unsigned long i = *ppos; |
2750 | IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode)); | 2750 | IXJ * j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); |
2751 | 2751 | ||
2752 | DECLARE_WAITQUEUE(wait, current); | 2752 | DECLARE_WAITQUEUE(wait, current); |
2753 | 2753 | ||
@@ -2804,7 +2804,7 @@ static ssize_t ixj_enhanced_read(struct file * file_p, char __user *buf, size_t | |||
2804 | { | 2804 | { |
2805 | int pre_retval; | 2805 | int pre_retval; |
2806 | ssize_t read_retval = 0; | 2806 | ssize_t read_retval = 0; |
2807 | IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); | 2807 | IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); |
2808 | 2808 | ||
2809 | pre_retval = ixj_PreRead(j, 0L); | 2809 | pre_retval = ixj_PreRead(j, 0L); |
2810 | switch (pre_retval) { | 2810 | switch (pre_retval) { |
@@ -2883,7 +2883,7 @@ static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf, | |||
2883 | int pre_retval; | 2883 | int pre_retval; |
2884 | ssize_t write_retval = 0; | 2884 | ssize_t write_retval = 0; |
2885 | 2885 | ||
2886 | IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); | 2886 | IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); |
2887 | 2887 | ||
2888 | pre_retval = ixj_PreWrite(j, 0L); | 2888 | pre_retval = ixj_PreWrite(j, 0L); |
2889 | switch (pre_retval) { | 2889 | switch (pre_retval) { |
@@ -4582,7 +4582,7 @@ static unsigned int ixj_poll(struct file *file_p, poll_table * wait) | |||
4582 | { | 4582 | { |
4583 | unsigned int mask = 0; | 4583 | unsigned int mask = 0; |
4584 | 4584 | ||
4585 | IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); | 4585 | IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); |
4586 | 4586 | ||
4587 | poll_wait(file_p, &(j->poll_q), wait); | 4587 | poll_wait(file_p, &(j->poll_q), wait); |
4588 | if (j->read_buffer_ready > 0) | 4588 | if (j->read_buffer_ready > 0) |
@@ -6657,7 +6657,7 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd, | |||
6657 | 6657 | ||
6658 | static int ixj_fasync(int fd, struct file *file_p, int mode) | 6658 | static int ixj_fasync(int fd, struct file *file_p, int mode) |
6659 | { | 6659 | { |
6660 | IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); | 6660 | IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); |
6661 | 6661 | ||
6662 | return fasync_helper(fd, file_p, mode, &j->async_queue); | 6662 | return fasync_helper(fd, file_p, mode, &j->async_queue); |
6663 | } | 6663 | } |