aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/soundcard.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/soundcard.c')
-rw-r--r--sound/oss/soundcard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 7c7793a0eb25..e7780349cc55 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -143,7 +143,7 @@ static int get_mixer_levels(void __user * arg)
143 143
144static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 144static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
145{ 145{
146 int dev = iminor(file->f_path.dentry->d_inode); 146 int dev = iminor(file_inode(file));
147 int ret = -EINVAL; 147 int ret = -EINVAL;
148 148
149 /* 149 /*
@@ -176,7 +176,7 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof
176 176
177static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) 177static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
178{ 178{
179 int dev = iminor(file->f_path.dentry->d_inode); 179 int dev = iminor(file_inode(file));
180 int ret = -EINVAL; 180 int ret = -EINVAL;
181 181
182 mutex_lock(&soundcard_mutex); 182 mutex_lock(&soundcard_mutex);
@@ -333,7 +333,7 @@ static int sound_mixer_ioctl(int mixdev, unsigned int cmd, void __user *arg)
333static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 333static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
334{ 334{
335 int len = 0, dtype; 335 int len = 0, dtype;
336 int dev = iminor(file->f_dentry->d_inode); 336 int dev = iminor(file_inode(file));
337 long ret = -EINVAL; 337 long ret = -EINVAL;
338 void __user *p = (void __user *)arg; 338 void __user *p = (void __user *)arg;
339 339
@@ -406,7 +406,7 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
406 406
407static unsigned int sound_poll(struct file *file, poll_table * wait) 407static unsigned int sound_poll(struct file *file, poll_table * wait)
408{ 408{
409 struct inode *inode = file->f_path.dentry->d_inode; 409 struct inode *inode = file_inode(file);
410 int dev = iminor(inode); 410 int dev = iminor(inode);
411 411
412 DEB(printk("sound_poll(dev=%d)\n", dev)); 412 DEB(printk("sound_poll(dev=%d)\n", dev));
@@ -431,7 +431,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
431 int dev_class; 431 int dev_class;
432 unsigned long size; 432 unsigned long size;
433 struct dma_buffparms *dmap = NULL; 433 struct dma_buffparms *dmap = NULL;
434 int dev = iminor(file->f_path.dentry->d_inode); 434 int dev = iminor(file_inode(file));
435 435
436 dev_class = dev & 0x0f; 436 dev_class = dev & 0x0f;
437 dev >>= 4; 437 dev >>= 4;