aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l/isdn_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/i4l/isdn_common.c')
-rw-r--r--drivers/isdn/i4l/isdn_common.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 9f6c6375ff75..c3d79eef9e32 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1059,7 +1059,7 @@ isdn_info_update(void)
1059static ssize_t 1059static ssize_t
1060isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off) 1060isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
1061{ 1061{
1062 uint minor = MINOR(file->f_dentry->d_inode->i_rdev); 1062 uint minor = iminor(file->f_dentry->d_inode);
1063 int len = 0; 1063 int len = 0;
1064 int drvidx; 1064 int drvidx;
1065 int chidx; 1065 int chidx;
@@ -1163,7 +1163,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
1163static ssize_t 1163static ssize_t
1164isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off) 1164isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
1165{ 1165{
1166 uint minor = MINOR(file->f_dentry->d_inode->i_rdev); 1166 uint minor = iminor(file->f_dentry->d_inode);
1167 int drvidx; 1167 int drvidx;
1168 int chidx; 1168 int chidx;
1169 int retval; 1169 int retval;
@@ -1225,7 +1225,7 @@ static unsigned int
1225isdn_poll(struct file *file, poll_table * wait) 1225isdn_poll(struct file *file, poll_table * wait)
1226{ 1226{
1227 unsigned int mask = 0; 1227 unsigned int mask = 0;
1228 unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev); 1228 unsigned int minor = iminor(file->f_dentry->d_inode);
1229 int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); 1229 int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
1230 1230
1231 lock_kernel(); 1231 lock_kernel();
@@ -1266,7 +1266,7 @@ isdn_poll(struct file *file, poll_table * wait)
1266static int 1266static int
1267isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) 1267isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
1268{ 1268{
1269 uint minor = MINOR(inode->i_rdev); 1269 uint minor = iminor(inode);
1270 isdn_ctrl c; 1270 isdn_ctrl c;
1271 int drvidx; 1271 int drvidx;
1272 int chidx; 1272 int chidx;
@@ -1717,7 +1717,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
1717static int 1717static int
1718isdn_open(struct inode *ino, struct file *filep) 1718isdn_open(struct inode *ino, struct file *filep)
1719{ 1719{
1720 uint minor = MINOR(ino->i_rdev); 1720 uint minor = iminor(ino);
1721 int drvidx; 1721 int drvidx;
1722 int chidx; 1722 int chidx;
1723 int retval = -ENODEV; 1723 int retval = -ENODEV;
@@ -1779,7 +1779,7 @@ isdn_open(struct inode *ino, struct file *filep)
1779static int 1779static int
1780isdn_close(struct inode *ino, struct file *filep) 1780isdn_close(struct inode *ino, struct file *filep)
1781{ 1781{
1782 uint minor = MINOR(ino->i_rdev); 1782 uint minor = iminor(ino);
1783 1783
1784 lock_kernel(); 1784 lock_kernel();
1785 if (minor == ISDN_MINOR_STATUS) { 1785 if (minor == ISDN_MINOR_STATUS) {