From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 14 Jul 2010 13:11:39 +0000 (+0200)
Subject: sound/oss-msnd-pinnacle: ioctl needs the inode
X-Git-Tag: v2.6.36-rc1~493^2^2~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=992cbf743862916dfbfdd3238fe3fecffbab5dd3;p=~emulex%2Finfiniband.git

sound/oss-msnd-pinnacle: ioctl needs the inode

This broke in sound/oss: convert to unlocked_ioctl, when I missed one
of the ioctl functions still using the inode pointer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index 9ffd29f32aa..bfaac5fa13d 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/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) {