sound/oss-msnd-pinnacle: ioctl needs the inode
authorArnd Bergmann <arnd@arndb.de>
Wed, 14 Jul 2010 13:11:39 +0000 (15:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 14 Jul 2010 13:14:02 +0000 (15:14 +0200)
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>
sound/oss/msnd_pinnacle.c

index 9ffd29f32aa54b7b357a40f3cf52d468335dcdbe..bfaac5fa13d7ad9f6d1b2ad69d412361f5f875c5 100644 (file)
@@ -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) {