aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/msnd_pinnacle.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/msnd_pinnacle.c')
-rw-r--r--sound/oss/msnd_pinnacle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index 536c4c0514d3..11ff7c55240c 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -642,7 +642,7 @@ static int mixer_ioctl(unsigned int cmd, unsigned long arg)
642 642
643static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 643static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
644{ 644{
645 int minor = iminor(file->f_path.dentry->d_inode); 645 int minor = iminor(file_inode(file));
646 int ret; 646 int ret;
647 647
648 if (cmd == OSS_GETVERSION) { 648 if (cmd == OSS_GETVERSION) {
@@ -1012,7 +1012,7 @@ static int dsp_write(const char __user *buf, size_t len)
1012 1012
1013static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off) 1013static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)
1014{ 1014{
1015 int minor = iminor(file->f_path.dentry->d_inode); 1015 int minor = iminor(file_inode(file));
1016 if (minor == dev.dsp_minor) 1016 if (minor == dev.dsp_minor)
1017 return dsp_read(buf, count); 1017 return dsp_read(buf, count);
1018 else 1018 else
@@ -1021,7 +1021,7 @@ static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_
1021 1021
1022static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off) 1022static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
1023{ 1023{
1024 int minor = iminor(file->f_path.dentry->d_inode); 1024 int minor = iminor(file_inode(file));
1025 if (minor == dev.dsp_minor) 1025 if (minor == dev.dsp_minor)
1026 return dsp_write(buf, count); 1026 return dsp_write(buf, count);
1027 else 1027 else