aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:40 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:49 -0500
commit7bc563239e4c276afebd11d2e6e67ddc0cc65f0d (patch)
tree7a4c13715285bc374297d439d01f703e0184df69 /sound/core
parent17b75e69493f655a09908045eddbb48718aef5de (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/core')
-rw-r--r--sound/core/info.c2
-rw-r--r--sound/core/pcm_native.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 0b4aab3225e5..54591e2eb6ee 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -488,7 +488,7 @@ static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
488 488
489static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) 489static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
490{ 490{
491 struct inode *inode = file->f_dentry->d_inode; 491 struct inode *inode = file->f_path.dentry->d_inode;
492 struct snd_info_private_data *data; 492 struct snd_info_private_data *data;
493 struct snd_info_entry *entry; 493 struct snd_info_entry *entry;
494 494
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 6ea67b16c676..b52e89393fa3 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1604,7 +1604,7 @@ static struct file *snd_pcm_file_fd(int fd)
1604 file = fget(fd); 1604 file = fget(fd);
1605 if (!file) 1605 if (!file)
1606 return NULL; 1606 return NULL;
1607 inode = file->f_dentry->d_inode; 1607 inode = file->f_path.dentry->d_inode;
1608 if (!S_ISCHR(inode->i_mode) || 1608 if (!S_ISCHR(inode->i_mode) ||
1609 imajor(inode) != snd_major) { 1609 imajor(inode) != snd_major) {
1610 fput(file); 1610 fput(file);