---

yaml --- r: 206676 b: refs/heads/master c: 992cbf7 h: refs/heads/master v: v3
git-mirror · Jul 14, 2010 · 7f03242 · 7f03242
1 parent 39dcc31
commit 7f03242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d209974cdc36aeeef406fa2019e9e1dacecbb979
+refs/heads/master: 992cbf743862916dfbfdd3238fe3fecffbab5dd3
diff --git a/trunk/sound/oss/msnd_pinnacle.c b/trunk/sound/oss/msnd_pinnacle.c
@@ -641,7 +641,7 @@ static int mixer_ioctl(unsigned int cmd, unsigned long arg)
 
 static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	int minor = iminor(inode);
+	int minor = iminor(file->f_path.dentry->d_inode);
 	int ret;
 
 	if (cmd == OSS_GETVERSION) {