diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:49 -0500 |
commit | 7bc563239e4c276afebd11d2e6e67ddc0cc65f0d (patch) | |
tree | 7a4c13715285bc374297d439d01f703e0184df69 /sound/oss/soundcard.c | |
parent | 17b75e69493f655a09908045eddbb48718aef5de (diff) |
[PATCH] struct path: convert sound
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/soundcard.c')
-rw-r--r-- | sound/oss/soundcard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 8fb8e7f99556..a89108cb74ea 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c | |||
@@ -141,7 +141,7 @@ static int get_mixer_levels(void __user * arg) | |||
141 | 141 | ||
142 | static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | 142 | static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) |
143 | { | 143 | { |
144 | int dev = iminor(file->f_dentry->d_inode); | 144 | int dev = iminor(file->f_path.dentry->d_inode); |
145 | int ret = -EINVAL; | 145 | int ret = -EINVAL; |
146 | 146 | ||
147 | /* | 147 | /* |
@@ -174,7 +174,7 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof | |||
174 | 174 | ||
175 | static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | 175 | static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) |
176 | { | 176 | { |
177 | int dev = iminor(file->f_dentry->d_inode); | 177 | int dev = iminor(file->f_path.dentry->d_inode); |
178 | int ret = -EINVAL; | 178 | int ret = -EINVAL; |
179 | 179 | ||
180 | lock_kernel(); | 180 | lock_kernel(); |
@@ -393,7 +393,7 @@ static int sound_ioctl(struct inode *inode, struct file *file, | |||
393 | 393 | ||
394 | static unsigned int sound_poll(struct file *file, poll_table * wait) | 394 | static unsigned int sound_poll(struct file *file, poll_table * wait) |
395 | { | 395 | { |
396 | struct inode *inode = file->f_dentry->d_inode; | 396 | struct inode *inode = file->f_path.dentry->d_inode; |
397 | int dev = iminor(inode); | 397 | int dev = iminor(inode); |
398 | 398 | ||
399 | DEB(printk("sound_poll(dev=%d)\n", dev)); | 399 | DEB(printk("sound_poll(dev=%d)\n", dev)); |
@@ -418,7 +418,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma) | |||
418 | int dev_class; | 418 | int dev_class; |
419 | unsigned long size; | 419 | unsigned long size; |
420 | struct dma_buffparms *dmap = NULL; | 420 | struct dma_buffparms *dmap = NULL; |
421 | int dev = iminor(file->f_dentry->d_inode); | 421 | int dev = iminor(file->f_path.dentry->d_inode); |
422 | 422 | ||
423 | dev_class = dev & 0x0f; | 423 | dev_class = dev & 0x0f; |
424 | dev >>= 4; | 424 | dev >>= 4; |