Merge with 2.1.56 as first part of merging back my code.

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/sound/soundcard.c b/drivers/sound/soundcard.c
index a9af5956b..450197a34 100644
--- a/drivers/sound/soundcard.c
+++ b/drivers/sound/soundcard.c
@@ -80,8 +80,7 @@ sound_write (struct inode *inode, struct file *file, const char *buf, unsigned l
   return sound_write_sw (dev, &files[dev], buf, count);
 }
 
-static long long
-sound_lseek (struct inode *inode, struct file *file, long long offset, int orig)
+static long long sound_lseek (struct file *file, long long offset, int orig)
 {
   return -EPERM;
 }
@@ -139,8 +138,8 @@ sound_release (struct inode *inode, struct file *file)
   sound_release_sw (dev, &files[dev]);
 #ifdef MODULE
   MOD_DEC_USE_COUNT;
-  return 0;
 #endif
+  return 0;
 }
 
 static int
@@ -256,13 +255,13 @@ sound_poll (struct file *file, poll_table * wait)
 }
 
 static int
-sound_mmap (struct inode *inode, struct file *file, struct vm_area_struct *vma)
+sound_mmap (struct file *file, struct vm_area_struct *vma)
 {
   int             dev, dev_class;
   unsigned long   size;
   struct dma_buffparms *dmap = NULL;
 
-  dev = MINOR (inode->i_rdev);
+  dev = MINOR (file->f_dentry->d_inode->i_rdev);
 
   files[dev].flags = file->f_flags;