From 992cbf743862916dfbfdd3238fe3fecffbab5dd3 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 14 Jul 2010 15:11:39 +0200 Subject: 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 Signed-off-by: Takashi Iwai --- sound/oss/msnd_pinnacle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/oss/msnd_pinnacle.c') diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index 9ffd29f32aa5..bfaac5fa13d7 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) { -- cgit v1.2.3-59-g8ed1b